Browse Source

frontend bug fixes, remove bindable prop, add not equals filter

gh-pages
Martin McKeaveney 6 years ago
parent
commit
3abf7daa73
  1. 4
      packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
  2. 23
      packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
  3. 4
      packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
  4. 3
      packages/builder/src/components/userInterface/PropertyControl.svelte
  5. 1
      packages/builder/src/components/userInterface/SettingsView.svelte
  6. 1
      packages/server/src/api/controllers/view/viewBuilder.js
  7. 2
      packages/server/src/middleware/authenticated.js

4
packages/builder/src/components/backend/DataTable/ViewDataTable.svelte

@ -37,8 +37,6 @@
<Table title={decodeURI(name)} schema={view.schema} {data}> <Table title={decodeURI(name)} schema={view.schema} {data}>
<FilterButton {view} /> <FilterButton {view} />
<CalculateButton {view} /> <CalculateButton {view} />
{#if view.calculation} <GroupByButton {view} />
<GroupByButton {view} />
{/if}
<ExportButton {view} /> <ExportButton {view} />
</Table> </Table>

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

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

4
packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte

@ -9,6 +9,10 @@
name: "Equals", name: "Equals",
key: "EQUALS", key: "EQUALS",
}, },
{
name: "Not Equals",
key: "NOT_EQUALS",
},
{ {
name: "Less Than", name: "Less Than",
key: "LT", key: "LT",

3
packages/builder/src/components/userInterface/PropertyControl.svelte

@ -13,6 +13,7 @@
import { onMount } from "svelte" import { onMount } from "svelte"
export let label = "" export let label = ""
export let bindable = true
export let componentInstance = {} export let componentInstance = {}
export let control = null export let control = null
export let key = "" export let key = ""
@ -93,7 +94,7 @@
{...props} {...props}
name={key} /> name={key} />
</div> </div>
{#if control === Input && !key.startsWith('_')} {#if bindable && control === Input && !key.startsWith('_')}
<button data-cy={`${key}-binding-button`} on:click={dropdown.show}> <button data-cy={`${key}-binding-button`} on:click={dropdown.show}>
<Icon name="edit" /> <Icon name="edit" />
</button> </button>

1
packages/builder/src/components/userInterface/SettingsView.svelte

@ -88,6 +88,7 @@
{#if screenOrPageInstance} {#if screenOrPageInstance}
{#each screenOrPageDefinition as def} {#each screenOrPageDefinition as def}
<PropertyControl <PropertyControl
bindable={false}
control={def.control} control={def.control}
label={def.label} label={def.label}
key={def.key} key={def.key}

1
packages/server/src/api/controllers/view/viewBuilder.js

@ -1,5 +1,6 @@
const TOKEN_MAP = { const TOKEN_MAP = {
EQUALS: "===", EQUALS: "===",
NOT_EQUALS: "!==",
LT: "<", LT: "<",
LTE: "<=", LTE: "<=",
MT: ">", MT: ">",

2
packages/server/src/middleware/authenticated.js

@ -40,7 +40,7 @@ module.exports = async (ctx, next) => {
ctx.user = { ctx.user = {
// if appId can't be determined from path param or subdomain // if appId can't be determined from path param or subdomain
appId: appId, appId,
} }
await next() await next()
return return

Loading…
Cancel
Save