From c573955998be482503db6f774a2c27ee9a6de909 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 10 Mar 2023 16:29:33 +0000
Subject: [PATCH] Update sorting and remove logs

---
 .../src/components/sheet/SheetControls.svelte             | 5 +----
 .../src/components/sheet/cells/HeaderCell.svelte          | 8 ++------
 .../src/components/sheet/controls/SortButton.svelte       | 5 ++---
 packages/frontend-core/src/fetch/DataFetch.js             | 1 -
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/frontend-core/src/components/sheet/SheetControls.svelte b/packages/frontend-core/src/components/sheet/SheetControls.svelte
index 28f1ec6ddb..2da051df06 100644
--- a/packages/frontend-core/src/components/sheet/SheetControls.svelte
+++ b/packages/frontend-core/src/components/sheet/SheetControls.svelte
@@ -1,10 +1,7 @@
 <script>
-  import { getContext } from "svelte"
   import { ActionButton } from "@budibase/bbui"
   import SortButton from "./controls/SortButton.svelte"
-
-  const { rows } = getContext("sheet")
 </script>
 
-<SortButton />
 <ActionButton icon="VisibilityOff" quiet size="M">Hide fields</ActionButton>
+<SortButton />
diff --git a/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte b/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
index e20fb5b9ce..4fb81a6458 100644
--- a/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
@@ -128,12 +128,8 @@
     {#if $config.allowEditColumns}
       <MenuItem icon="Edit" on:click={editColumn}>Edit column</MenuItem>
     {/if}
-    <MenuItem icon="SortOrderUp" on:click={sortAscending}>
-      Sort ascending
-    </MenuItem>
-    <MenuItem icon="SortOrderDown" on:click={sortDescending}>
-      Sort descending
-    </MenuItem>
+    <MenuItem icon="SortOrderUp" on:click={sortAscending}>Sort A-Z</MenuItem>
+    <MenuItem icon="SortOrderDown" on:click={sortDescending}>Sort Z-A</MenuItem>
     <MenuItem disabled={!canMoveLeft} icon="ArrowLeft" on:click={moveLeft}>
       Move left
     </MenuItem>
diff --git a/packages/frontend-core/src/components/sheet/controls/SortButton.svelte b/packages/frontend-core/src/components/sheet/controls/SortButton.svelte
index 1e28af66cb..42e09380c9 100644
--- a/packages/frontend-core/src/components/sheet/controls/SortButton.svelte
+++ b/packages/frontend-core/src/components/sheet/controls/SortButton.svelte
@@ -4,15 +4,14 @@
 
   const { sort, columns, stickyColumn } = getContext("sheet")
   const orderOptions = [
-    { label: "Ascending", value: "ascending" },
-    { label: "Descending", value: "descending" },
+    { label: "A-Z", value: "ascending" },
+    { label: "Z-A", value: "descending" },
   ]
 
   let open = false
   let anchor
 
   $: columnOptions = getColumnOptions($stickyColumn, $columns)
-  $: console.log($sort)
 
   const getColumnOptions = (stickyColumn, columns) => {
     let options = []
diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js
index 049a840128..f7afa3e911 100644
--- a/packages/frontend-core/src/fetch/DataFetch.js
+++ b/packages/frontend-core/src/fetch/DataFetch.js
@@ -196,7 +196,6 @@ export default class DataFetch {
     const { query } = get(this.store)
 
     // Get the actual data
-    console.log("===== FETCH =====")
     let { rows, info, hasNextPage, cursor, error } = await this.getData()
 
     // If we don't support searching, do a client search