From 35b9ab353ea4677326032400231bc4a9e530829a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 7 May 2021 13:13:51 +0100
Subject: [PATCH] Add table app list view

---
 .../src/components/start/AppCard.svelte       |  29 ++---
 .../src/components/start/AppGridView.svelte   |   6 +-
 .../src/components/start/AppTableView.svelte  | 100 ++++++++++++++++--
 .../components/start/CreateAppModal.svelte    |   3 +-
 .../pages/builder/portal/apps/index.svelte    |  24 ++++-
 5 files changed, 123 insertions(+), 39 deletions(-)

diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index 9a14efd81b..de01c125d6 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -7,43 +7,28 @@
     ActionMenu,
     MenuItem,
     Link,
-    notifications,
   } from "@budibase/bbui"
-  import download from "downloadjs"
   import { gradient } from "actions"
+  import { url } from "@roxi/routify"
 
-  export let name
-  export let _id
+  export let app
+  export let exportApp
 
   let appExportLoading = false
-
-  async function exportApp() {
-    appExportLoading = true
-    try {
-      download(
-        `/api/backups/export?appId=${_id}&appname=${encodeURIComponent(name)}`
-      )
-      notifications.success("App export complete")
-    } catch (err) {
-      console.error(err)
-      notifications.error("App export failed")
-    } finally {
-      appExportLoading = false
-    }
-  }
 </script>
 
 <Layout noPadding gap="XS">
   <div class="preview" use:gradient />
   <div class="title">
-    <Link href={`/builder/app/${_id}`}>
+    <Link href={$url(`../../app/${app._id}`)}>
       <Heading size="XS">
-        {name}
+        {app.name}
       </Heading>
     </Link>
     <ActionMenu>
       <Icon slot="control" name="More" hoverable />
-      <MenuItem on:click={exportApp} icon="Download">Export</MenuItem>
+      <MenuItem on:click={() => exportApp(app)} icon="Download">Export</MenuItem
+      >
     </ActionMenu>
   </div>
   <div class="status">
diff --git a/packages/builder/src/components/start/AppGridView.svelte b/packages/builder/src/components/start/AppGridView.svelte
index 947477b03e..c6267e4369 100644
--- a/packages/builder/src/components/start/AppGridView.svelte
+++ b/packages/builder/src/components/start/AppGridView.svelte
@@ -1,16 +1,16 @@
 <script>
   import AppCard from "./AppCard.svelte"
   import { apps } from "stores/portal"
+
+  export let exportApp
 </script>
 
 {#if $apps.length}
   <div class="appList">
     {#each $apps as app}
-      <AppCard {...app} />
+      <AppCard {exportApp} {app} />
     {/each}
   </div>
-{:else}
-  <div>No apps found.</div>
 {/if}
 
 <style>
diff --git a/packages/builder/src/components/start/AppTableView.svelte b/packages/builder/src/components/start/AppTableView.svelte
index 0886f3e1eb..57ab1f00e6 100644
--- a/packages/builder/src/components/start/AppTableView.svelte
+++ b/packages/builder/src/components/start/AppTableView.svelte
@@ -1,23 +1,105 @@
 <script>
-  import AppCard from "./AppCard.svelte"
   import { apps } from "stores/portal"
-  import { Table } from "@budibase/bbui"
+  import { gradient } from "actions"
+  import {
+    Heading,
+    Button,
+    Icon,
+    ActionMenu,
+    MenuItem,
+    Link,
+  } from "@budibase/bbui"
+  import { goto, url } from "@roxi/routify"
+
+  export let exportApp
+
+  const openApp = app => {
+    $goto(`../../app/${app._id}`)
+  }
 </script>
 
 {#if $apps.length}
-  <div class="appList">
+  <div class="appTable">
     {#each $apps as app}
-      <AppCard {...app} />
+      <div class="title">
+        <div class="preview" use:gradient />
+        <Link href={$url(`../../app/${app._id}`)}>
+          <Heading size="XS">
+            {app.name}
+          </Heading>
+        </Link>
+      </div>
+      <div>
+        Edited {Math.round(Math.random() * 10 + 1)} months ago
+      </div>
+      <div>
+        {#if Math.random() < 0.33}
+          <div class="status status--open" />
+          Open
+        {:else if Math.random() < 0.33}
+          <div class="status status--locked-other" />
+          Locked by Will Wheaton
+        {:else}
+          <div class="status status--locked-you" />
+          Locked by you
+        {/if}
+      </div>
+      <div class="actions">
+        <Button on:click={() => openApp(app)} size="S" secondary>Open</Button>
+        <ActionMenu align="right">
+          <Icon hoverable slot="control" name="More" />
+          <MenuItem on:click={() => exportApp(app)} icon="Download">
+            Export
+          </MenuItem>
+        </ActionMenu>
+      </div>
     {/each}
   </div>
-{:else}
-  <div>No apps found.</div>
 {/if}
 
 <style>
-  .appList {
+  .appTable {
     display: grid;
-    grid-gap: 50px;
-    grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+    grid-template-rows: auto;
+    grid-template-columns: 1fr 1fr 1fr auto;
+    align-items: center;
+  }
+  .appTable > div {
+    border-bottom: var(--border-light);
+    height: 70px;
+    display: grid;
+    align-items: center;
+    gap: var(--spacing-xl);
+    grid-template-columns: auto 1fr;
+  }
+  .preview {
+    height: 40px;
+    width: 40px;
+    border-radius: var(--border-radius-s);
+  }
+  .title :global(a) {
+    text-decoration: none;
+  }
+  .title :global(h1:hover) {
+    color: var(--spectrum-global-color-blue-600);
+    cursor: pointer;
+    transition: color 130ms ease;
+  }
+  .status {
+    height: 10px;
+    width: 10px;
+    border-radius: 50%;
+  }
+  .status--locked-you {
+    background-color: var(--spectrum-global-color-orange-600);
+  }
+  .status--locked-other {
+    background-color: var(--spectrum-global-color-red-600);
+  }
+  .status--open {
+    background-color: var(--spectrum-global-color-green-600);
+  }
+  .actions {
+    padding-right: 10px;
   }
 </style>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index fcfea2d8cf..32774ff33c 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -13,6 +13,7 @@
   import { onMount } from "svelte"
   import Logo from "/assets/bb-logo.svg"
   import { capitalise } from "../../helpers"
+  import { goto } from "@roxi/routify"
 
   export let template
 
@@ -111,7 +112,7 @@
       }
       const userResp = await api.post(`/api/users/metadata/self`, user)
       await userResp.json()
-      window.location = `/builder/app/${appJson._id}`
+      $goto(`/builder/app/${appJson._id}`)
     } catch (error) {
       console.error(error)
       notifications.error(error)
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 09b179bdf1..b95e8bf5d2 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -9,6 +9,7 @@
     Select,
     Modal,
     Page,
+    notifications,
   } from "@budibase/bbui"
   import AppGridView from "components/start/AppGridView.svelte"
   import AppTableView from "components/start/AppTableView.svelte"
@@ -17,12 +18,13 @@
   import analytics from "analytics"
   import { onMount } from "svelte"
   import { apps } from "stores/portal"
+  import download from "downloadjs"
 
   let layout = "grid"
   let modal
   let template
 
-  async function checkKeys() {
+  const checkKeys = async () => {
     const response = await api.get(`/api/keys/`)
     const keys = await response.json()
     if (keys.userId) {
@@ -30,11 +32,25 @@
     }
   }
 
-  function initiateAppImport() {
+  const initiateAppImport = () => {
     template = { fromFile: true }
     modal.show()
   }
 
+  const exportApp = app => {
+    try {
+      download(
+        `/api/backups/export?appId=${app._id}&appname=${encodeURIComponent(
+          app.name
+        )}`
+      )
+      notifications.success("App export complete")
+    } catch (err) {
+      console.error(err)
+      notifications.error("App export failed")
+    }
+  }
+
   onMount(() => {
     checkKeys()
     apps.load()
@@ -70,9 +86,9 @@
       </ActionGroup>
     </div>
     {#if layout === "grid"}
-      <AppGridView />
+      <AppGridView {exportApp} />
     {:else}
-      <AppTableView />
+      <AppTableView {exportApp} />
     {/if}
   </Layout>
 </Page>