From d316ba71e199f1153b37eb9f8f4d0376591d038d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 19 Aug 2024 15:30:21 +0100
Subject: [PATCH] Update buttons for legacy views

---
 .../backend/DataTable/ViewDataTable.svelte    | 80 -------------------
 .../data/table/[tableId]/index.svelte         |  4 +-
 .../data/table/[tableId]/view/index.svelte    | 19 -----
 .../view/v1/[viewName]/_layout.svelte         | 24 ------
 .../[tableId]/view/v1/[viewName]/index.svelte | 18 -----
 .../data/table/[tableId]/view/v1/index.svelte |  5 --
 .../data/view/v1/[viewName]/index.svelte      | 78 +++++++++++++++++-
 7 files changed, 75 insertions(+), 153 deletions(-)
 delete mode 100644 packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/index.svelte
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/_layout.svelte
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/index.svelte
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/index.svelte

diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
deleted file mode 100644
index 684cbd6cf4..0000000000
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ /dev/null
@@ -1,80 +0,0 @@
-<script>
-  import { API } from "api"
-  import { tables } from "stores/builder"
-
-  import Table from "./Table.svelte"
-  import CalculateButton from "./buttons/CalculateButton.svelte"
-  import GroupByButton from "./buttons/GroupByButton.svelte"
-  import ViewFilterButton from "./buttons/ViewFilterButton.svelte"
-  import ExportButton from "./buttons/ExportButton.svelte"
-  import ManageAccessButton from "./buttons/ManageAccessButton.svelte"
-  import HideAutocolumnButton from "./buttons/HideAutocolumnButton.svelte"
-  import { notifications } from "@budibase/bbui"
-  import { ROW_EXPORT_FORMATS } from "constants/backend"
-
-  export let view = {}
-
-  let hideAutocolumns = true
-  let data = []
-  let loading = false
-
-  $: name = view.name
-  $: schema = view.schema
-  $: calculation = view.calculation
-
-  $: supportedFormats = Object.values(ROW_EXPORT_FORMATS).filter(key => {
-    if (calculation && key === ROW_EXPORT_FORMATS.JSON_WITH_SCHEMA) {
-      return false
-    }
-    return true
-  })
-
-  // Fetch rows for specified view
-  $: fetchViewData(name, view.field, view.groupBy, view.calculation)
-
-  async function fetchViewData(name, field, groupBy, calculation) {
-    loading = true
-    const _tables = $tables.list
-    const allTableViews = _tables.map(table => table.views)
-    const thisView = allTableViews.filter(
-      views => views != null && views[name] != null
-    )[0]
-
-    // Don't fetch view data if the view no longer exists
-    if (!thisView) {
-      loading = false
-      return
-    }
-    try {
-      data = await API.fetchViewData({
-        name,
-        calculation,
-        field,
-        groupBy,
-      })
-    } catch (error) {
-      notifications.error("Error fetching view data")
-    }
-    loading = false
-  }
-</script>
-
-<Table
-  title={decodeURI(name)}
-  {schema}
-  tableId={view.tableId}
-  {data}
-  {loading}
-  rowCount={10}
-  allowEditing={false}
-  bind:hideAutocolumns
->
-  <ViewFilterButton {view} />
-  <CalculateButton {view} />
-  {#if view.calculation}
-    <GroupByButton {view} />
-  {/if}
-  <ManageAccessButton resourceId={decodeURI(name)} />
-  <HideAutocolumnButton bind:hideAutocolumns />
-  <ExportButton view={view.name} formats={supportedFormats} />
-</Table>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index b862ab52ae..5b5132255b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -115,9 +115,7 @@
       {#if relationshipsEnabled}
         <GridRelationshipButton />
       {/if}
-      {#if isUsersTable}
-        <EditRolesButton />
-      {:else}
+      {#if !isUsersTable}
         <GridImportButton />
       {/if}
       <GridExportButton />
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/index.svelte
deleted file mode 100644
index 623cd224db..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/index.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script>
-  import { onMount } from "svelte"
-  import { views, viewsV2 } from "stores/builder"
-  import { redirect } from "@roxi/routify"
-
-  onMount(async () => {
-    if ($viewsV2.selected) {
-      $redirect(`./v2/${$viewsV2.selected.id}`)
-    } else if ($viewsV2.list?.length) {
-      $redirect(`./v2/${$viewsV2.list[0].id}`)
-    } else if ($views.selected) {
-      $redirect(`./${encodeURIComponent($views.selected?.name)}`)
-    } else if ($views.list?.length) {
-      $redirect(`./${encodeURIComponent($views.list[0].name)}`)
-    } else {
-      $redirect("../")
-    }
-  })
-</script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/_layout.svelte
deleted file mode 100644
index df3a18c2bb..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/_layout.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script>
-  import { views, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
-  import * as routify from "@roxi/routify"
-  import { onDestroy } from "svelte"
-
-  $: name = $views.selectedViewName
-  $: builderStore.selectResource(name)
-
-  const stopSyncing = syncURLToState({
-    urlParam: "viewName",
-    stateKey: "selectedViewName",
-    validate: name => $views.list?.some(view => view.name === name),
-    update: views.select,
-    fallbackUrl: "../../",
-    store: views,
-    routify,
-    decode: decodeURIComponent,
-  })
-
-  onDestroy(stopSyncing)
-</script>
-
-<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/index.svelte
deleted file mode 100644
index 51149b602d..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/[viewName]/index.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-  import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
-  import { views } from "stores/builder"
-
-  $: selectedView = $views.selected
-</script>
-
-{#if selectedView}
-  <ViewDataTable view={selectedView} />
-{:else}<i>Create your first table to start building</i>{/if}
-
-<style>
-  i {
-    font-size: var(--font-size-m);
-    color: var(--grey-4);
-    margin-top: 2px;
-  }
-</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/index.svelte
deleted file mode 100644
index c11ca87023..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/view/v1/index.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import { redirect } from "@roxi/routify"
-
-  $redirect("../")
-</script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
index 51149b602d..b8a8dc514b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
@@ -1,12 +1,82 @@
 <script>
-  import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
   import { views } from "stores/builder"
+  import { API } from "api"
+  import { tables } from "stores/builder"
+  import Table from "./Table.svelte"
+  import CalculateButton from "./buttons/CalculateButton.svelte"
+  import GroupByButton from "./buttons/GroupByButton.svelte"
+  import ViewFilterButton from "./buttons/ViewFilterButton.svelte"
+  import ExportButton from "./buttons/ExportButton.svelte"
+  import ManageAccessButton from "./buttons/ManageAccessButton.svelte"
+  import HideAutocolumnButton from "./buttons/HideAutocolumnButton.svelte"
+  import { notifications } from "@budibase/bbui"
+  import { ROW_EXPORT_FORMATS } from "constants/backend"
 
-  $: selectedView = $views.selected
+  let hideAutocolumns = true
+  let data = []
+  let loading = false
+
+  $: view = $views.selected
+  $: name = view.name
+  $: schema = view.schema
+  $: calculation = view.calculation
+  $: supportedFormats = Object.values(ROW_EXPORT_FORMATS).filter(key => {
+    if (calculation && key === ROW_EXPORT_FORMATS.JSON_WITH_SCHEMA) {
+      return false
+    }
+    return true
+  })
+
+  // Fetch rows for specified view
+  $: fetchViewData(name, view.field, view.groupBy, view.calculation)
+
+  async function fetchViewData(name, field, groupBy, calculation) {
+    loading = true
+    const _tables = $tables.list
+    const allTableViews = _tables.map(table => table.views)
+    const thisView = allTableViews.filter(
+      views => views != null && views[name] != null
+    )[0]
+
+    // Don't fetch view data if the view no longer exists
+    if (!thisView) {
+      loading = false
+      return
+    }
+    try {
+      data = await API.fetchViewData({
+        name,
+        calculation,
+        field,
+        groupBy,
+      })
+    } catch (error) {
+      notifications.error("Error fetching view data")
+    }
+    loading = false
+  }
 </script>
 
-{#if selectedView}
-  <ViewDataTable view={selectedView} />
+{#if view}
+  <Table
+    title={decodeURI(name)}
+    {schema}
+    tableId={view.tableId}
+    {data}
+    {loading}
+    rowCount={10}
+    allowEditing={false}
+    bind:hideAutocolumns
+  >
+    <ViewFilterButton {view} />
+    <CalculateButton {view} />
+    {#if view.calculation}
+      <GroupByButton {view} />
+    {/if}
+    <ManageAccessButton resourceId={decodeURI(name)} />
+    <HideAutocolumnButton bind:hideAutocolumns />
+    <ExportButton view={view.name} formats={supportedFormats} />
+  </Table>
 {:else}<i>Create your first table to start building</i>{/if}
 
 <style>