From 0dd432f286bfe8897a20f668049346f5640c2929 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 23 Aug 2024 13:34:36 +0100
Subject: [PATCH] Add support for old views in new view nav bar

---
 .../[tableId]/_components/ViewNavBar.svelte   | 46 +++++++++++++++---
 .../[tableId]}/v1/[viewName]/_layout.svelte   |  0
 .../[tableId]}/v1/[viewName]/index.svelte     | 47 ++++++++++---------
 .../{view => table/[tableId]}/v1/index.svelte |  0
 .../app/[application]/data/view/index.svelte  | 19 --------
 packages/client/src/constants.js              |  3 +-
 6 files changed, 68 insertions(+), 47 deletions(-)
 rename packages/builder/src/pages/builder/app/[application]/data/{view => table/[tableId]}/v1/[viewName]/_layout.svelte (100%)
 rename packages/builder/src/pages/builder/app/[application]/data/{view => table/[tableId]}/v1/[viewName]/index.svelte (75%)
 rename packages/builder/src/pages/builder/app/[application]/data/{view => table/[tableId]}/v1/index.svelte (100%)
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/data/view/index.svelte

diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
index cc62eb78d5..5d3f3ac5b4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
@@ -48,12 +48,18 @@
   $: datasource = $datasources.list.find(ds => ds._id === table?.sourceId)
   $: tableSelectedBy = $userSelectedResourceMap[table?._id]
   $: tableEditable = table?._id !== TableNames.USERS
-  $: activeId = $params.viewId ?? $params.tableId
+  $: activeId = $params.viewName ?? $params.viewId ?? $params.tableId
   $: views = Object.values(table?.views || {})
     .filter(x => x.version === 2)
     .slice()
     .sort(alphabetical)
+  $: v1Views = Object.values(table?.views || {})
+    .filter(x => x.version !== 2)
+    .slice()
+    .sort(alphabetical)
   $: setUpObserver(views)
+  $: hasViews = v1Views.length || views.length
+
   $: overflowedViews = views.filter(view => !viewVisibiltyMap[view.id])
   $: viewHidden = viewVisibiltyMap[activeId] === false
 
@@ -61,6 +67,10 @@
     return $url(`../${$params.tableId}/${encodeURIComponent(viewId)}`)
   })
 
+  const viewV1Url = derived([url, params], ([$url, $params]) => viewName => {
+    return $url(`../${$params.tableId}/v1/${encodeURIComponent(viewName)}`)
+  })
+
   const tableUrl = derived(url, $url => tableId => $url(`../${tableId}`))
 
   const openTableContextMenu = e => {
@@ -176,8 +186,8 @@
 
 <div class="nav">
   <IntegrationIcon
-    integrationType={datasource.source}
-    schema={datasource.schema}
+    integrationType={datasource?.source}
+    schema={datasource?.schema}
     size="24"
   />
   <a
@@ -202,8 +212,32 @@
       />
     {/if}
   </a>
-  {#if views.length}
+  {#if hasViews}
     <div class="nav__views" bind:this={viewContainer}>
+      {#each v1Views as view (view.name)}
+        {@const selectedBy = $userSelectedResourceMap[view.name]}
+        <a
+          href={$viewV1Url(view.name)}
+          class="nav-item"
+          class:active={view.name === activeId}
+          on:contextmenu={e => openViewContextMenu(e, view)}
+          data-id={view.name}
+        >
+          <div class="nav-item__title">
+            {view.name}
+          </div>
+          {#if selectedBy}
+            <UserAvatars size="XS" users={selectedBy} />
+          {/if}
+          <Icon
+            on:click={e => openViewContextMenu(e, view)}
+            hoverable
+            name="MoreSmallList"
+            color="var(--spectrum-global-color-gray-600)"
+            hoverColor="var(--spectrum-global-color-gray-900)"
+          />
+        </a>
+      {/each}
       {#each views as view (view.id)}
         {@const selectedBy = $userSelectedResourceMap[view.id]}
         <a
@@ -231,7 +265,7 @@
       {/each}
     </div>
   {/if}
-  {#if !views.length && tableEditable}
+  {#if !hasViews && tableEditable}
     <Button cta on:click={createViewModal?.show}>Create a view</Button>
     <span>
       To create subsets of data, control access and more, create a view.
@@ -274,7 +308,7 @@
       {/each}
     </ActionMenu>
   {/if}
-  {#if views.length}
+  {#if hasViews}
     <Icon
       name="Add"
       size="L"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
rename to packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
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/table/[tableId]/v1/[viewName]/index.svelte
similarity index 75%
rename from packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
index d96a9239ba..0084d9b5da 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
@@ -57,29 +57,34 @@
   }
 </script>
 
-{#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}
+<div class="view-v1">
+  {#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}
+</div>
 
 <style>
+  .view-v1 {
+    padding: var(--spacing-xl);
+  }
   i {
     font-size: var(--font-size-m);
     color: var(--grey-4);
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/data/view/v1/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/index.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
deleted file mode 100644
index 623cd224db..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/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/client/src/constants.js b/packages/client/src/constants.js
index f7e3e86d40..bfa2d08dc5 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -3,7 +3,8 @@ export { FieldType as FieldTypes } from "@budibase/types"
 export const ActionTypes = {
   ValidateForm: "ValidateForm",
   UpdateFieldValue: "UpdateFieldValue",
-  RefreshDatasource: "RefreshDatasource",
+  RefreshDatasource:
+     "RefreshDatasource",
   AddDataProviderQueryExtension: "AddDataProviderQueryExtension",
   RemoveDataProviderQueryExtension: "RemoveDataProviderQueryExtension",
   SetDataProviderSorting: "SetDataProviderSorting",