Improve sorting logic

packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte

@@ -9,13 +9,11 @@
   let anchor
 
   $: columnOptions = $columns
+    .filter(col => canBeSortColumn(col.schema))
     .map(col => ({
       label: col.label || col.name,
       value: col.name,
-      type: col.schema?.type,
-      related: col.related,
     }))
-    .filter(col => canBeSortColumn(col))
   $: orderOptions = getOrderOptions($sort.column, columnOptions)
 
   const getOrderOptions = (column, columnOptions) => {

packages/frontend-core/src/components/grid/lib/renderers.js

@@ -35,7 +35,7 @@ const TypeComponentMap = {
   [FieldType.BB_REFERENCE_SINGLE]: BBReferenceSingleCell,
 }
 export const getCellRenderer = column => {
-  if (column.calculation) {
+  if (column.calculationType) {
     return NumberCell
   }
   return (

packages/frontend-core/src/components/grid/stores/columns.js

@@ -160,7 +160,7 @@ export const initialise = context => {
             order: fieldSchema.order ?? oldColumn?.order,
             conditions: fieldSchema.conditions,
             related: fieldSchema.related,
-            calculation: fieldSchema.calculationType != null,
+            calculationType: fieldSchema.calculationType,
           }
           // Override a few properties for primary display
           if (field === primaryDisplay) {

packages/frontend-core/src/utils/schema.js

@@ -5,7 +5,7 @@ export const getColumnIcon = column => {
   if (column.schema.icon) {
     return column.schema.icon
   }
-  if (column.calculation) {
+  if (column.calculationType) {
     return "Calculator"
   }
   if (column.schema.autocolumn) {