Merge pull request #715 from Budibase/bugz

Bugfixes

package.json

@@ -10,7 +10,7 @@
     "eslint-plugin-svelte3": "^2.7.3",
     "lerna": "3.14.1",
     "prettier": "^1.19.1",
-    "prettier-plugin-svelte": "^1.1.0",
+    "prettier-plugin-svelte": "^1.4.0",
     "rimraf": "^3.0.2",
     "rollup-plugin-replace": "^2.2.0",
     "svelte": "^3.28.0"
@@ -35,4 +35,4 @@
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.8"
   }
-}
+}

packages/builder/cypress/integration/createTable.spec.js

@@ -27,7 +27,6 @@ context("Create a Table", () => {
     cy.get(".actions input")
       .first()
       .type("updated")
-    cy.get("select").select("Text")
     cy.contains("Save Column").click()
     cy.contains("nameupdated").should("have.text", "nameupdated")
   })

packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte

@@ -23,9 +23,7 @@
   class="automation-block hoverable"
   on:click={addBlockToAutomation}
   data-cy={stepId}>
-  <div>
+  <div><i class={blockDefinition.icon} /></div>
-    <i class={blockDefinition.icon} />
-  </div>
   <div class="automation-text">
     <h4>{blockDefinition.name}</h4>
     <p>{blockDefinition.description}</p>

packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte

@@ -62,10 +62,7 @@
     {#if $automationStore.selectedBlock}
       <AutomationBlockSetup bind:block={$automationStore.selectedBlock} />
     {:else if $automationStore.selectedAutomation}
-      <div class="block-label">
+      <div class="block-label">Automation <b>{automation.name}</b></div>
-        Automation
-        <b>{automation.name}</b>
-      </div>
       <Button secondary wide on:click={testAutomation}>Test Automation</Button>
     {/if}
   </div>

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

@@ -108,7 +108,8 @@
                 <div
                   class:link={row[header] && row[header].length}
                   on:click={() => selectRelationship(row, header)}>
-                  {row[header] ? row[header].length : 0} related row(s)
+                  {row[header] ? row[header].length : 0}
+                  related row(s)
                 </div>
               {:else if schema[header].type === 'attachment'}
                 <AttachmentList files={row[header] || []} />

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

@@ -49,9 +49,7 @@
       <button class:selected={currentPage === 0} on:click={() => selectPage(0)}>
         1
       </button>
-      {#if currentPage > 3}
+      {#if currentPage > 3}<button disabled>...</button>{/if}
-        <button disabled>...</button>
-      {/if}
       {#each pagesAroundCurrent as idx}
         <button
           class:selected={idx === currentPage}
@@ -59,9 +57,7 @@
           {idx + 1}
         </button>
       {/each}
-      {#if currentPage < numPages - 4}
+      {#if currentPage < numPages - 4}<button disabled>...</button>{/if}
-        <button disabled>...</button>
-      {/if}
       <button
         class:selected={currentPage === numPages - 1}
         on:click={() => selectPage(numPages - 1)}>
@@ -77,8 +73,13 @@
 
   <p>
     {#if numPages > 1}
-      Showing {ITEMS_PER_PAGE * currentPage + 1} - {ITEMS_PER_PAGE * currentPage + pageItemCount}
+      Showing
-      of {data.length} rows
+      {ITEMS_PER_PAGE * currentPage + 1}
+      -
+      {ITEMS_PER_PAGE * currentPage + pageItemCount}
+      of
+      {data.length}
+      rows
     {:else if numPages === 1}Showing all {data.length} row(s){/if}
   </p>
 </div>

packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte

@@ -65,16 +65,18 @@
 <div class="actions">
   <Input label="Name" thin bind:value={field.name} />
 
-  <Select
+  {#if !originalName}
-    secondary
+    <Select
-    thin
+      secondary
-    label="Type"
+      thin
-    on:change={handleFieldConstraints}
+      label="Type"
-    bind:value={field.type}>
+      on:change={handleFieldConstraints}
-    {#each Object.values(fieldDefinitions) as field}
+      bind:value={field.type}>
-      <option value={field.type}>{field.name}</option>
+      {#each Object.values(fieldDefinitions) as field}
-    {/each}
+        <option value={field.type}>{field.name}</option>
-  </Select>
+      {/each}
+    </Select>
+  {/if}
 
   {#if field.type !== 'link'}
     <Toggle

packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte

@@ -20,10 +20,21 @@
   let modal
   let name
   let dataImport
+  let error = ""
 
   function resetState() {
     name = ""
     dataImport = undefined
+    error = ""
+  }
+
+  function checkValid(evt) {
+    const tableName = evt.target.value
+    if ($backendUiStore.models?.some(model => model.name === tableName)) {
+      error = `Table with name ${tableName} already exists. Please choose another name.`
+      return
+    }
+    error = ""
   }
 
   async function saveTable() {
@@ -61,12 +72,14 @@
     title="Create Table"
     confirmText="Create"
     onConfirm={saveTable}
-    disabled={!name || (dataImport && !dataImport.valid)}>
+    disabled={error || !name || (dataImport && !dataImport.valid)}>
     <Input
       data-cy="table-name-input"
       thin
       label="Table Name"
-      bind:value={name} />
+      on:input={checkValid}
+      bind:value={name}
+      {error} />
     <div>
       <Label grey extraSmall>Create Table from CSV (Optional)</Label>
       <TableDataImport bind:dataImport />

packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte

@@ -13,6 +13,8 @@
   let dropdown
   let editing
   let confirmDeleteDialog
+  let error = ""
+  let originalName = table.name
   let templateScreens
   let willBeDeleted
 
@@ -49,6 +51,18 @@
     notifier.success("Table renamed successfully")
     hideEditor()
   }
+
+  function checkValid(evt) {
+    const tableName = evt.target.value
+    if (
+      originalName !== tableName &&
+      $backendUiStore.models?.some(model => model.name === tableName)
+    ) {
+      error = `Table with name ${tableName} already exists. Please choose another name.`
+      return
+    }
+    error = ""
+  }
 </script>
 
 <div bind:this={anchor} class="icon" on:click={dropdown.show}>
@@ -58,7 +72,12 @@
   {#if editing}
     <div class="actions">
       <h5>Edit Table</h5>
-      <Input label="Table Name" thin bind:value={table.name} />
+      <Input
+        label="Table Name"
+        thin
+        bind:value={table.name}
+        on:input={checkValid}
+        {error} />
       <Select
         label="Primary Display Column"
         thin
@@ -71,7 +90,7 @@
       </Select>
       <footer>
         <Button secondary on:click={hideEditor}>Cancel</Button>
-        <Button primary on:click={save}>Save</Button>
+        <Button primary disabled={error} on:click={save}>Save</Button>
       </footer>
     </div>
   {:else}

packages/builder/src/components/common/Checkbox.svelte

@@ -39,7 +39,6 @@
     transition: 0.2s ease transform, 0.2s ease background-color,
       0.2s ease box-shadow;
     overflow: hidden;
-    z-index: 1;
     border-radius: 4px;
   }
 

packages/builder/src/components/common/Notification/NotificationDisplay.svelte

@@ -31,9 +31,7 @@
       style="background: {themes[notification.type]};"
       transition:fly={{ y: -30 }}>
       <div class="content">{notification.message}</div>
-      {#if notification.icon}
+      {#if notification.icon}<i class={notification.icon} />{/if}
-        <i class={notification.icon} />
-      {/if}
     </div>
   {/each}
 </div>

packages/builder/src/components/common/Switcher.svelte

@@ -12,15 +12,12 @@
 </script>
 
 <div class="root">
-
   <div class="switcher">
-
     {#each tabs as tab}
       <button class:selected={selected === tab} on:click={() => selectTab(tab)}>
         {tab}
       </button>
     {/each}
-
   </div>
 
   <div class="panel">
@@ -34,7 +31,6 @@
       <slot name="3" />
     {/if}
   </div>
-
 </div>
 
 <style>

packages/builder/src/components/settings/Integration.svelte

@@ -5,9 +5,7 @@
 
 <div class="container">
   <div class="content">
-    <div class="img">
+    <div class="img"><img src="https://picsum.photos/60/60" alt="zoom" /></div>
-      <img src="https://picsum.photos/60/60" alt="zoom" />
-    </div>
     <div class="body">
       <div class="title">Zoom</div>
       <div class="description">

packages/builder/src/components/settings/tabs/Users.svelte

@@ -58,6 +58,7 @@
       <Input thin bind:value={username} name="Name" placeholder="Username" />
       <Input
         thin
+        type="password"
         bind:value={password}
         name="Password"
         placeholder="Password" />

packages/builder/src/components/start/AppCard.svelte

@@ -10,7 +10,9 @@
   <Spacer medium />
   <div class="card-footer">
     <TextButton text medium blue href="/_builder/{_id}">
-      Open {name} →
+      Open
+      {name}
+      →
     </TextButton>
   </div>
 </div>

packages/builder/src/components/start/TemplateList.svelte

@@ -28,12 +28,11 @@
           <Spacer small />
           <Body medium grey>{template.category}</Body>
           <Body lh small black>{template.description}</Body>
-          <div>
+          <div><img src={template.image} width="100%" /></div>
-            <img src={template.image} width="100%" />
-          </div>
           <div class="card-footer">
             <Button secondary on:click={() => onSelect(template)}>
-              Create {template.name}
+              Create
+              {template.name}
             </Button>
           </div>
         </div>

packages/builder/src/components/userInterface/CategoryTab.svelte

@@ -13,7 +13,6 @@
       {category.name}
     </li>
   {/each}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte

@@ -99,9 +99,7 @@
 </script>
 
 <div bind:this={anchor} on:click|stopPropagation={() => {}}>
-  <div class="icon" on:click={dropdown.show}>
+  <div class="icon" on:click={dropdown.show}><i class="ri-more-line" /></div>
-    <i class="ri-more-line" />
-  </div>
 </div>
 <DropdownMenu
   bind:this={dropdown}

packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte

@@ -1,21 +1,10 @@
 <script>
-  import { setContext, onMount } from "svelte"
-
   import { store } from "builderStore"
-  import {
-    LayoutIcon,
-    PaintIcon,
-    TerminalIcon,
-    CircleIndicator,
-    EventsIcon,
-  } from "components/common/Icons/"
   import panelStructure from "./temporaryPanelStructure.js"
   import CategoryTab from "./CategoryTab.svelte"
   import DesignView from "./DesignView.svelte"
   import SettingsView from "./SettingsView.svelte"
 
-  let current_view = "design"
-  let codeEditor
   let flattenedPanel = flattenComponents(panelStructure.categories)
   let categories = [
     { value: "settings", name: "Settings" },
@@ -23,7 +12,6 @@
   ]
   let selectedCategory = categories[0]
 
-  $: components = $store.components
   $: componentInstance =
     $store.currentView !== "component"
       ? { ...$store.currentPreviewItem, ...$store.currentComponentInfo }
@@ -76,7 +64,6 @@
 </script>
 
 <div class="root">
-
   <CategoryTab
     onClick={category => (selectedCategory = category)}
     {categories}
@@ -99,9 +86,7 @@
         onScreenPropChange={store.setPageOrScreenProp}
         screenOrPageInstance={$store.currentView !== 'component' && $store.currentPreviewItem} />
     {/if}
-
   </div>
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/ComponentSelectionList.svelte

@@ -1,33 +1,13 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { splitName } from "./pagesParsing/splitRootComponentName.js"
+  import { store } from "builderStore"
   import components from "./temporaryPanelStructure.js"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CategoryTab from "./CategoryTab.svelte"
-  import {
-    find,
-    sortBy,
-    groupBy,
-    values,
-    filter,
-    map,
-    uniqBy,
-    flatten,
-  } from "lodash/fp"
-
-  import { pipe } from "components/common/core"
 
   import Tab from "./ItemTab/Tab.svelte"
-  import { store } from "builderStore"
 
   export let toggleTab
 
-  let selectTemplateDialog
-  let selectedTemplateInstance
-  let templateInstances = []
-
-  let selectedComponent = null
-
   const categories = components.categories
   let selectedCategory = categories[0]
 
@@ -45,7 +25,6 @@
 </script>
 
 <div class="root">
-
   <CategoryTab
     onClick={category => (selectedCategory = category)}
     {selectedCategory}

packages/builder/src/components/userInterface/ComponentsHierarchy.svelte

@@ -38,13 +38,11 @@
 </script>
 
 <div class="root">
-
   {#each screens as screen}
     <div
       class="budibase__nav-item screen-header-row"
       class:selected={$store.currentComponentInfo._id === screen.props._id}
       on:click|stopPropagation={() => changeScreen(screen)}>
-
       <span
         class="icon"
         class:rotate={$store.currentPreviewItem.name !== screen.props._instanceName}>
@@ -69,7 +67,6 @@
         {dragDropStore} />
     {/if}
   {/each}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte

@@ -129,7 +129,6 @@
 <ul>
   {#each components as component, index (component._id)}
     <li on:click|stopPropagation={() => selectComponent(component)}>
-
       {#if $dragDropStore && $dragDropStore.targetComponent === component && $dragDropStore.dropPosition === 'above'}
         <div
           on:drop={drop}

packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte

@@ -20,7 +20,6 @@
 <div class="root">
   {#if $store.currentFrontEndType === 'page' || $store.screens.length}
     <div class="switcher">
-
       <button
         class:selected={selected === COMPONENT_SELECTION_TAB}
         on:click={() => selectTab(COMPONENT_SELECTION_TAB)}>
@@ -32,7 +31,6 @@
         on:click={() => selectTab(PROPERTIES_TAB)}>
         Edit
       </button>
-
     </div>
 
     <div class="panel">
@@ -43,10 +41,8 @@
       {#if selected === COMPONENT_SELECTION_TAB}
         <ComponentSelectionList {toggleTab} />
       {/if}
-
     </div>
   {/if}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/DesignView.svelte

@@ -28,7 +28,6 @@
 </script>
 
 <div class="design-view-container">
-
   <div class="design-view-state-categories">
     <FlatButtonGroup value={selectedCategory} {buttonProps} {onChange} />
   </div>

packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte

@@ -18,9 +18,7 @@
 </script>
 
 <div class="handler-option">
-  {#if parameter.name === 'automation'}
+  {#if parameter.name === 'automation'}<span>{parameter.name}</span>{/if}
-    <span>{parameter.name}</span>
-  {/if}
   {#if parameter.name === 'automation'}
     <Select on:change bind:value={parameter.value}>
       <option value="" />

packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte

@@ -48,7 +48,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte

@@ -109,7 +109,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte

@@ -107,7 +107,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>

packages/builder/src/components/userInterface/IconSelect/IconSelect.svelte

@@ -126,9 +126,7 @@
             on:click={() => switchLetter(letter)}>
             {letter}
           </span>
-          {#if idx !== alphabet.length - 1}
+          {#if idx !== alphabet.length - 1}<span>-</span>{/if}
-            <span>-</span>
-          {/if}
         {/each}
       </div>
       <div class="search-input">

packages/builder/src/components/userInterface/ItemTab/Item.svelte

@@ -3,9 +3,7 @@
 </script>
 
 <div data-cy={item.name} class="item-item" on:click>
-  <div class="item-icon">
+  <div class="item-icon"><i class={item.icon} /></div>
-    <i class={item.icon} />
-  </div>
   <div class="item-text">
     <div class="item-name">{item.name}</div>
   </div>

packages/builder/src/components/userInterface/ItemTab/Tab.svelte

@@ -1,8 +1,10 @@
 <script>
   import { createEventDispatcher } from "svelte"
+  import { store } from "builderStore"
+  import Item from "./Item.svelte"
+
   const dispatch = createEventDispatcher()
 
-  import Item from "./Item.svelte"
   export let list
 
   let category = list
@@ -21,10 +23,12 @@
 </script>
 
 {#if !list.isCategory}
-  <button class="back-button" on:click={() => (list = category)}>Back</button>
+  <button class="back-button" on:click={goBack}>Back</button>
 {/if}
 {#each list.children as item}
-  <Item {item} on:click={() => handleClick(item)} />
+  {#if !item.showOnPages || item.showOnPages.includes($store.currentPageName)}
+    <Item {item} on:click={() => handleClick(item)} />
+  {/if}
 {/each}
 
 <style>

packages/builder/src/components/userInterface/NewScreenModal.svelte

@@ -89,7 +89,6 @@
 </script>
 
 <ModalContent title="New Screen" confirmText="Create Screen" onConfirm={save}>
-
   <Select
     label="Choose a Template"
     bind:value={templateIndex}
@@ -109,5 +108,4 @@
     error={routeError}
     bind:value={route}
     on:change={routeChanged} />
-
 </ModalContent>

packages/builder/src/components/userInterface/temporaryPanelStructure.js

@@ -1165,14 +1165,6 @@ export default {
           },
           children: [],
         },
-        // {
-        // name: "Map",
-        // _component: "@budibase/standard-components/datamap",
-        // description: "Shiny map",
-        // icon: "ri-map-pin-line",
-        // properties: { design: { ...all } },
-        // children: [],
-        // },
       ],
     },
     {
@@ -1213,6 +1205,7 @@ export default {
             "A component that automatically generates a login screen for your app.",
           icon: "ri-login-box-line",
           children: [],
+          showOnPages: ["unauthenticated"],
           properties: {
             design: { ...all },
             settings: [

packages/builder/src/pages/[application]/_reset.svelte

@@ -68,7 +68,10 @@
       <span
         class:active={false}
         class="topnavitemright"
-        on:click={() => window.open(`/${application}`)}>
+        on:click={() => {
+          document.cookie = 'budibase:token=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;'
+          window.open(`/${application}`)
+        }}>
         <PreviewIcon />
       </span>
     </div>
@@ -77,7 +80,7 @@
   {#await promise}
     <!-- This should probably be some kind of loading state? -->
     <div />
-  {:then _}
+  {:then results}
     <slot />
   {:catch error}
     <p>Something went wrong: {error.message}</p>

packages/builder/src/pages/[application]/backend/table/[selectedTable]/index.svelte

@@ -7,9 +7,7 @@
 
 {#if $backendUiStore.selectedDatabase._id && selectedTable.name}
   <TableDataTable />
-{:else}
+{:else}<i>Create your first table to start building</i>{/if}
-  <i>Create your first table to start building</i>
-{/if}
 
 <style>
   i {

packages/builder/src/pages/[application]/backend/table/index.svelte

@@ -23,9 +23,7 @@
 
 {#if $backendUiStore.tables.length === 0}
   <i>Create your first table to start building</i>
-{:else}
+{:else}<i>Select a table to edit</i>{/if}
-  <i>Select a table to edit</i>
-{/if}
 
 <style>
   i {

packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte

@@ -7,9 +7,7 @@
 
 {#if $backendUiStore.selectedDatabase._id && selectedView}
   <ViewDataTable view={selectedView} />
-{:else}
+{:else}<i>Create your first table to start building</i>{/if}
-  <i>Create your first table to start building</i>
-{/if}
 
 <style>
   i {

packages/server/src/api/controllers/auth.js

@@ -41,7 +41,7 @@ exports.authenticate = async ctx => {
     dbUser = await instanceDb.get(generateUserID(username))
   } catch (_) {
     // do not want to throw a 404 - as this could be
-    // used to dtermine valid usernames
+    // used to determine valid usernames
     ctx.throw(401, "Invalid Credentials")
   }
 

packages/server/src/api/controllers/row.js

@@ -73,6 +73,12 @@ exports.save = async function(ctx) {
   let row = ctx.request.body
   row.tableId = ctx.params.tableId
 
+  if (ctx.request.body.type === "delete") {
+    await bulkDelete(ctx)
+    ctx.body = ctx.request.body.rows
+    return
+  }
+
   if (!row._rev && !row._id) {
     row._id = generateRowID(row.tableId)
   }
@@ -348,3 +354,25 @@ const TYPE_TRANSFORM_MAP = {
     false: false,
   },
 }
+
+async function bulkDelete(ctx) {
+  const instanceId = ctx.user.instanceId
+  const { rows } = ctx.request.body
+  const db = new CouchDB(instanceId)
+
+  const linkUpdates = rows.map(row =>
+    linkRows.updateLinks({
+      instanceId,
+      eventType: linkRows.EventType.ROW_DELETE,
+      row,
+      tableId: row.tableId,
+    })
+  )
+
+  await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true })))
+  await Promise.all(linkUpdates)
+
+  rows.forEach(row => {
+    ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
+  })
+}

packages/server/src/api/controllers/static.js

@@ -1,6 +1,5 @@
 const send = require("koa-send")
 const { resolve, join } = require("../../utilities/centralPath")
-const jwt = require("jsonwebtoken")
 const fetch = require("node-fetch")
 const fs = require("fs-extra")
 const uuid = require("uuid")
@@ -13,8 +12,8 @@ const {
 } = require("../../utilities/budibaseDir")
 const CouchDB = require("../../db")
 const setBuilderToken = require("../../utilities/builder/setBuilderToken")
-const { ANON_LEVEL_ID } = require("../../utilities/accessLevels")
 const fileProcessor = require("../../utilities/fileProcessor")
+const { AuthTypes } = require("../../constants")
 
 exports.serveBuilder = async function(ctx) {
   let builderPath = resolve(__dirname, "../../../builder")
@@ -136,7 +135,8 @@ exports.performLocalFileProcessing = async function(ctx) {
 }
 
 exports.serveApp = async function(ctx) {
-  const mainOrAuth = ctx.auth.authenticated ? "main" : "unauthenticated"
+  const mainOrAuth =
+    ctx.auth.authenticated === AuthTypes.APP ? "main" : "unauthenticated"
 
   // default to homedir
   const appPath = resolve(
@@ -146,26 +146,7 @@ exports.serveApp = async function(ctx) {
     mainOrAuth
   )
 
-  let appId = ctx.params.appId
+  const appId = ctx.user.appId
-  if (process.env.CLOUD) {
-    appId = ctx.subdomains[1]
-  }
-
-  // only set the appId cookie for /appId .. we COULD check for valid appIds
-  // but would like to avoid that DB hit
-  const looksLikeAppId = /^(app_)?[0-9a-f]{32}$/.test(appId)
-  if (looksLikeAppId && !ctx.auth.authenticated) {
-    const anonUser = {
-      userId: "ANON",
-      accessLevelId: ANON_LEVEL_ID,
-      appId,
-    }
-    const anonToken = jwt.sign(anonUser, ctx.config.jwtSecret)
-    ctx.cookies.set("budibase:token", anonToken, {
-      path: "/",
-      httpOnly: false,
-    })
-  }
 
   if (process.env.CLOUD) {
     const S3_URL = `https://${appId}.app.budi.live/assets/${appId}/${mainOrAuth}/${ctx.file ||
@@ -200,7 +181,8 @@ exports.serveAttachment = async function(ctx) {
 
 exports.serveAppAsset = async function(ctx) {
   // default to homedir
-  const mainOrAuth = ctx.auth.authenticated ? "main" : "unauthenticated"
+  const mainOrAuth =
+    ctx.auth.authenticated === AuthTypes.APP ? "main" : "unauthenticated"
 
   const appPath = resolve(
     budibaseAppsDir(),

packages/server/src/constants/index.js

@@ -0,0 +1,7 @@
+const AuthTypes = {
+  APP: "app",
+  BUILDER: "builder",
+  EXTERNAL: "external",
+}
+
+exports.AuthTypes = AuthTypes

packages/server/src/middleware/authenticated.js

@@ -7,6 +7,8 @@ const {
   BUILDER_LEVEL_ID,
   ANON_LEVEL_ID,
 } = require("../utilities/accessLevels")
+const environment = require("../environment")
+const { AuthTypes } = require("../constants")
 
 module.exports = async (ctx, next) => {
   if (ctx.path === "/_builder") {
@@ -17,36 +19,32 @@ module.exports = async (ctx, next) => {
   const appToken = ctx.cookies.get("budibase:token")
   const builderToken = ctx.cookies.get("builder:token")
 
-  if (builderToken) {
+  let token
-    try {
+  // if running locally in the builder itself
-      const jwtPayload = jwt.verify(builderToken, ctx.config.jwtSecret)
+  if (!environment.CLOUD && !appToken) {
-      ctx.auth = {
+    token = builderToken
-        apiKey: jwtPayload.apiKey,
+    ctx.auth.authenticated = AuthTypes.BUILDER
-        authenticated: jwtPayload.accessLevelId === BUILDER_LEVEL_ID,
+  } else {
-      }
+    token = appToken
-      ctx.user = {
+    ctx.auth.authenticated = AuthTypes.APP
-        ...jwtPayload,
-        accessLevel: await getAccessLevel(
-          jwtPayload.instanceId,
-          jwtPayload.accessLevelId
-        ),
-      }
-    } catch (_) {
-      // empty: do nothing
-    }
-
-    await next()
-    return
   }
 
-  if (!appToken) {
+  if (!token) {
     ctx.auth.authenticated = false
+
+    const appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
+
+    ctx.user = {
+      // if appId can't be determined from path param or subdomain
+      appId: appId || ctx.referer.split("/").pop(),
+    }
     await next()
     return
   }
 
   try {
-    const jwtPayload = jwt.verify(appToken, ctx.config.jwtSecret)
+    const jwtPayload = jwt.verify(token, ctx.config.jwtSecret)
+    ctx.auth.apiKey = jwtPayload.apiKey
     ctx.user = {
       ...jwtPayload,
       accessLevel: await getAccessLevel(
@@ -54,10 +52,6 @@ module.exports = async (ctx, next) => {
         jwtPayload.accessLevelId
       ),
     }
-    ctx.auth = {
-      authenticated: ctx.user.accessLevelId !== ANON_LEVEL_ID,
-      apiKey: jwtPayload.apiKey,
-    }
   } catch (err) {
     ctx.throw(err.status || STATUS_CODES.FORBIDDEN, err.text)
   }

packages/server/src/middleware/authorized.js

@@ -7,6 +7,7 @@ const {
 } = require("../utilities/accessLevels")
 const environment = require("../environment")
 const { apiKeyTable } = require("../db/dynamoClient")
+const { AuthTypes } = require("../constants")
 
 module.exports = (permName, getItemId) => async (ctx, next) => {
   if (
@@ -21,8 +22,7 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
 
     if (apiKeyInfo) {
       ctx.auth = {
-        authenticated: true,
+        authenticated: AuthTypes.EXTERNAL,
-        external: true,
         apiKey: ctx.headers["x-api-key"],
       }
       ctx.user = {
@@ -34,6 +34,9 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
     ctx.throw(403, "API key invalid")
   }
 
+  // don't expose builder endpoints in the cloud
+  if (environment.CLOUD && permName === BUILDER) return
+
   if (!ctx.auth.authenticated) {
     ctx.throw(403, "Session not authenticated")
   }
@@ -42,6 +45,10 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
     ctx.throw(403, "User not found")
   }
 
+  if (ctx.user.accessLevel._id === ADMIN_LEVEL_ID) {
+    return next()
+  }
+
   if (ctx.user.accessLevel._id === BUILDER_LEVEL_ID) {
     return next()
   }
@@ -53,10 +60,6 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
 
   const permissionId = ({ name, itemId }) => name + (itemId ? `-${itemId}` : "")
 
-  if (ctx.user.accessLevel._id === ADMIN_LEVEL_ID) {
-    return next()
-  }
-
   const thisPermissionId = permissionId({
     name: permName,
     itemId: getItemId && getItemId(ctx),

packages/server/src/utilities/accessLevels.js

@@ -21,7 +21,6 @@ module.exports.PRETTY_ACCESS_LEVELS = {
   [module.exports.ADMIN_LEVEL_ID]: "Admin",
   [module.exports.POWERUSER_LEVEL_ID]: "Power user",
   [module.exports.BUILDER_LEVEL_ID]: "Builder",
-  [module.exports.ANON_LEVEL_ID]: "Anonymous",
 }
 module.exports.adminPermissions = [
   {

packages/server/src/utilities/csvParser.js

@@ -7,6 +7,7 @@ const VALIDATORS = {
 }
 
 const PARSERS = {
+  number: attribute => Number(attribute),
   datetime: attribute => new Date(attribute).toISOString(),
 }
 
@@ -24,7 +25,7 @@ function parse(path, parsers) {
         }
       }
     })
-    result.fromFile(path).subscribe(row => {
+    result.subscribe(row => {
       // For each CSV row parse all the columns that need parsed
       for (let key in parsers) {
         if (!schema[key] || schema[key].success) {

packages/server/src/utilities/fileProcessor.js

@@ -10,7 +10,6 @@ async function processImage(file) {
   const imgMeta = await sharp(file.path)
     .resize(300)
     .toFile(file.outputPath)
-
   return {
     ...file,
     ...imgMeta,

packages/standard-components/src/Card.svelte

@@ -23,9 +23,7 @@
 </script>
 
 <div use:cssVars={cssVariables} class="container">
-  {#if showImage}
+  {#if showImage}<img class="image" src={imageUrl} alt="" />{/if}
-    <img class="image" src={imageUrl} alt="" />
-  {/if}
   <div class="content">
     <h2 class="heading">{heading}</h2>
     <h4 class="text">{description}</h4>

packages/standard-components/src/CardHorizontal.svelte

@@ -26,9 +26,7 @@
 </script>
 
 <div use:cssVars={cssVariables} class="container">
-  {#if showImage}
+  {#if showImage}<img class="image" src={imageUrl} alt="" />{/if}
-    <img class="image" src={imageUrl} alt="" />
-  {/if}
   <div class="content">
     <main>
       <h2 class="heading">{heading}</h2>

packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte

@@ -27,15 +27,4 @@
         on:newRow={() => dispatch('newRow')} />
  </DropdownMenu> -->
 
-<!-- <style>
+<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->
-  div {
-    display: grid;
-    grid-template-columns: auto auto;
-    place-items: start center;
-  }
-  h5 {
-    padding: var(--spacing-xl) 0 0 var(--spacing-xl);
-    margin: 0;
-    font-weight: 500;
-  }
-</style> -->

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

@@ -135,7 +135,9 @@
         {#if selectedRows.length > 0}
           <DeleteButton text small on:click={deleteRows}>
             <Icon name="addrow" />
-            Delete {selectedRows.length} row(s)
+            Delete
+            {selectedRows.length}
+            row(s)
           </DeleteButton>
         {/if}
       </div>

packages/standard-components/src/Login.svelte

@@ -42,9 +42,7 @@
 <div class="root">
   <div class="content">
     {#if logo}
-      <div class="logo-container">
+      <div class="logo-container"><img src={logo} alt="logo" /></div>
-        <img src={logo} alt="logo" />
-      </div>
     {/if}
 
     {#if title}

packages/standard-components/src/Navigation.svelte

@@ -36,10 +36,14 @@
 </script>
 
 <nav use:cssVars={cssVariables}>
-  <a href="/">
+  {#if logoUrl}
-    <img class="logo" alt="logo" src={logoUrl} height="48" />
+    <a href="/">
-    <span>{title}</span>
+      <img class="logo" alt="logo" src={logoUrl} height="48" />
-  </a>
+      <span>{title}</span>
+    </a>
+  {:else}
+    <div />
+  {/if}
   <div class="menu-items" bind:this={itemContainer} />
 </nav>
 

packages/standard-components/src/Text.svelte

@@ -33,6 +33,4 @@
   <sub class={className}>{text}</sub>
 {:else if isTag('sup')}
   <sup class={className}>{text}</sup>
-{:else}
+{:else}<span>{text}</span>{/if}
-  <span>{text}</span>
-{/if}

packages/standard-components/src/attachments/AttachmentList.svelte

@@ -12,9 +12,7 @@
       <div class="file">
         {#if FILE_TYPES.IMAGE.includes(file.extension.toLowerCase())}
           <img {width} {height} src={file.url} alt="preview of {file.name}" />
-        {:else}
+        {:else}<i class="far fa-file" />{/if}
-          <i class="far fa-file" />
-        {/if}
       </div>
       <span>{file.name}</span>
     </a>

yarn.lock

@@ -3690,10 +3690,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier-plugin-svelte@^1.1.0:
+prettier-plugin-svelte@^1.4.0:
-  version "1.1.0"
+  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.1.0.tgz#e6ec282d8457598b0c02164083b11ad8cb8ab304"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.4.0.tgz#bb992759fb77ec2c3545d454a7c60f7a258cb745"
-  integrity sha512-wmIggG/ryV0wcmE9D5p+k5TwKDpS2SGKJpF6IV1aYHK7dkBJD+di1w47Ci00DRsI4RrXZRC2Ef37DSyrTb6Zqg==
+  integrity sha512-KXO2He7Kql0Lz4DdlzVli1j2JTDUR9jPV/DqyfnJmY1pCeSV1qZkxgdsyYma35W6OLrCAr/G6yKdmzo+75u2Ng==
 
 prettier@^1.19.1:
   version "1.19.1"