From 7b2e471d829507c44ff8af917d8835b27d691a55 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:32:31 +0100
Subject: [PATCH 1/3] Only hide plugin search bar when no plugins exist

---
 .../src/pages/builder/portal/manage/plugins/index.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
index 84722c27be..b9b84307a8 100644
--- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
@@ -55,7 +55,7 @@
           Add plugin
         </Button>
       </div>
-      {#if filteredPlugins?.length}
+      {#if $plugins?.length}
         <div class="filters">
           <div class="select">
             <Select

From 167f8f368bd27f721a8c7e662f022748d5852636 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:58:44 +0100
Subject: [PATCH 2/3] Only show sortable fields for sort column settings

---
 .../design/settings/componentSettings.js      |  2 +
 .../controls/SortableFieldSelect.svelte       | 47 +++++++++++++++++++
 packages/client/manifest.json                 |  8 ++--
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index 56ae3de490..6b109f80c3 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -7,6 +7,7 @@ import TableSelect from "./controls/TableSelect.svelte"
 import ColorPicker from "./controls/ColorPicker.svelte"
 import { IconSelect } from "./controls/IconSelect"
 import FieldSelect from "./controls/FieldSelect.svelte"
+import SortableFieldSelect from "./controls/SortableFieldSelect.svelte"
 import MultiFieldSelect from "./controls/MultiFieldSelect.svelte"
 import SearchFieldSelect from "./controls/SearchFieldSelect.svelte"
 import SchemaSelect from "./controls/SchemaSelect.svelte"
@@ -41,6 +42,7 @@ const componentMap = {
   filter: FilterEditor,
   url: URLSelect,
   columns: ColumnEditor,
+  "field/sortable": SortableFieldSelect,
   "field/string": FormFieldSelect,
   "field/number": FormFieldSelect,
   "field/options": FormFieldSelect,
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
new file mode 100644
index 0000000000..21ed68ce68
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -0,0 +1,47 @@
+<script>
+  import { Select } from "@budibase/bbui"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "builderStore/dataBinding"
+  import { currentAsset } from "builderStore"
+  import { createEventDispatcher } from "svelte"
+  import { UNSORTABLE_TYPES } from "constants"
+
+  export let componentInstance = {}
+  export let value = ""
+  export let placeholder
+
+  const dispatch = createEventDispatcher()
+  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: options = getSortableFields(schema)
+  $: boundValue = getValidValue(value, options)
+
+  const getSortableFields = schema => {
+    return Object.entries(schema || {})
+      .filter(entry => !UNSORTABLE_TYPES.includes(entry[1].type))
+      .map(entry => entry[0])
+  }
+
+  const getValidValue = (value, options) => {
+    // Reset value if there aren't any options
+    if (!Array.isArray(options)) {
+      return null
+    }
+
+    // Reset value if the value isn't found in the options
+    if (options.indexOf(value) === -1) {
+      return null
+    }
+
+    return value
+  }
+
+  const onChange = value => {
+    boundValue = getValidValue(value.detail, options)
+    dispatch("change", boundValue)
+  }
+</script>
+
+<Select {placeholder} value={boundValue} on:change={onChange} {options} />
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index b6d4941e4c..d9c9b14676 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3523,7 +3523,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -3853,7 +3853,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4018,7 +4018,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4177,7 +4177,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },

From bfee51aeab32fa50d082f3b416e4d970aca52387 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 16:11:53 +0100
Subject: [PATCH 3/3] Update formula tooltip to explain they cannot be sorted
 by

---
 .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 21059b32dd..44a750cbb1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -487,7 +487,7 @@
         ]}
         getOptionLabel={option => option.label}
         getOptionValue={option => option.value}
-        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered,
+        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered or sorted by,
          while static formula are calculated when the row is saved."
       />
     {/if}