From 988789f1d46fb1e3185ed1d403d3193c831f99d3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 14 Oct 2020 21:43:36 +0100
Subject: [PATCH] frontend bug fixes, remove bindable prop, add not equals
 filter

---
 .../backend/DataTable/ViewDataTable.svelte    |  4 +---
 .../popovers/CreateEditColumnPopover.svelte   | 23 +++++++++----------
 .../DataTable/popovers/FilterPopover.svelte   |  4 ++++
 .../userInterface/PropertyControl.svelte      |  3 ++-
 .../userInterface/SettingsView.svelte         |  1 +
 .../src/api/controllers/view/viewBuilder.js   |  1 +
 .../server/src/middleware/authenticated.js    |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index d3c82e4f7c..5bafadd767 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -37,8 +37,6 @@
 <Table title={decodeURI(name)} schema={view.schema} {data}>
   <FilterButton {view} />
   <CalculateButton {view} />
-  {#if view.calculation}
-    <GroupByButton {view} />
-  {/if}
+  <GroupByButton {view} />
   <ExportButton {view} />
 </Table>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
index 14755ce6fe..8fb843ee77 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
@@ -65,18 +65,17 @@
 <div class="actions">
   <Input label="Name" thin bind:value={field.name} />
 
-  {#if !originalName}
-    <Select
-      secondary
-      thin
-      label="Type"
-      on:change={handleFieldConstraints}
-      bind:value={field.type}>
-      {#each Object.values(fieldDefinitions) as field}
-        <option value={field.type}>{field.name}</option>
-      {/each}
-    </Select>
-  {/if}
+  <Select
+    disabled={originalName}
+    secondary
+    thin
+    label="Type"
+    on:change={handleFieldConstraints}
+    bind:value={field.type}>
+    {#each Object.values(fieldDefinitions) as field}
+      <option value={field.type}>{field.name}</option>
+    {/each}
+  </Select>
 
   {#if field.type !== 'link'}
     <Toggle
diff --git a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
index 5e8b5d1d77..871b1a699e 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
@@ -9,6 +9,10 @@
       name: "Equals",
       key: "EQUALS",
     },
+    {
+      name: "Not Equals",
+      key: "NOT_EQUALS",
+    },
     {
       name: "Less Than",
       key: "LT",
diff --git a/packages/builder/src/components/userInterface/PropertyControl.svelte b/packages/builder/src/components/userInterface/PropertyControl.svelte
index 91e35f2321..8d21e6fc82 100644
--- a/packages/builder/src/components/userInterface/PropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/PropertyControl.svelte
@@ -13,6 +13,7 @@
   import { onMount } from "svelte"
 
   export let label = ""
+  export let bindable = true
   export let componentInstance = {}
   export let control = null
   export let key = ""
@@ -93,7 +94,7 @@
       {...props}
       name={key} />
   </div>
-  {#if control === Input && !key.startsWith('_')}
+  {#if bindable && control === Input && !key.startsWith('_')}
     <button data-cy={`${key}-binding-button`} on:click={dropdown.show}>
       <Icon name="edit" />
     </button>
diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte
index bae1b364c9..91d9ba6b2b 100644
--- a/packages/builder/src/components/userInterface/SettingsView.svelte
+++ b/packages/builder/src/components/userInterface/SettingsView.svelte
@@ -88,6 +88,7 @@
 {#if screenOrPageInstance}
   {#each screenOrPageDefinition as def}
     <PropertyControl
+      bindable={false}
       control={def.control}
       label={def.label}
       key={def.key}
diff --git a/packages/server/src/api/controllers/view/viewBuilder.js b/packages/server/src/api/controllers/view/viewBuilder.js
index df1c3daef9..2dba667c82 100644
--- a/packages/server/src/api/controllers/view/viewBuilder.js
+++ b/packages/server/src/api/controllers/view/viewBuilder.js
@@ -1,5 +1,6 @@
 const TOKEN_MAP = {
   EQUALS: "===",
+  NOT_EQUALS: "!==",
   LT: "<",
   LTE: "<=",
   MT: ">",
diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js
index 33cafca17a..8a046f4327 100644
--- a/packages/server/src/middleware/authenticated.js
+++ b/packages/server/src/middleware/authenticated.js
@@ -40,7 +40,7 @@ module.exports = async (ctx, next) => {
 
     ctx.user = {
       // if appId can't be determined from path param or subdomain
-      appId: appId,
+      appId,
     }
     await next()
     return