From e5a34871c7eb1fe01a226a0d50c75f83af7be497 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 9 Dec 2020 18:18:47 +0000
Subject: [PATCH] Add role selection for viewing screens and smart handling of
 preview screen

---
 packages/builder/src/builderStore/index.js    |  4 +-
 .../src/builderStore/store/frontend.js        |  1 +
 .../ComponentNavigationTree/PathTree.svelte   |  2 +
 .../ComponentNavigationTree/index.svelte      | 65 +++++++++++++++++--
 .../userInterface/FrontendNavigatePane.svelte | 30 +++++++--
 .../components/userInterface/Layout.svelte    |  3 +-
 .../userInterface/NewScreenModal.svelte       |  2 +-
 7 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 887ef733e4..f1914efab2 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -2,7 +2,7 @@ import { getFrontendStore } from "./store/frontend"
 import { getBackendUiStore } from "./store/backend"
 import { getAutomationStore } from "./store/automation/"
 import { getThemeStore } from "./store/theme"
-import { derived } from "svelte/store"
+import { derived, writable } from "svelte/store"
 import analytics from "analytics"
 import { LAYOUT_NAMES } from "../constants"
 import { makePropsSafe } from "components/userInterface/assetParsing/createProps"
@@ -74,6 +74,8 @@ export const mainLayout = derived(store, $store => {
   )
 })
 
+export const selectedAccessRole = writable("BASIC")
+
 export const initialise = async () => {
   try {
     await analytics.activate()
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index a853a98dce..754cd6e127 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -110,6 +110,7 @@ export const getFrontendStore = () => {
         const creatingNewScreen = screen._id === undefined
         const response = await api.post(`/api/screens`, screen)
         screen = await response.json()
+        await store.actions.routing.fetch()
 
         store.update(state => {
           const foundScreen = state.screens.findIndex(
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte
index 765041b184..5dd4ed9a7c 100644
--- a/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte
+++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte
@@ -20,6 +20,7 @@
   export let route
   export let path
   export let indent
+  export let border
 
   $: selectedScreen = $currentAsset
 
@@ -34,6 +35,7 @@
   icon="ri-folder-line"
   text={path}
   opened={true}
+  {border}
   withArrow={route.subpaths} />
 
 {#each Object.entries(route.subpaths) as [url, subpath]}
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
index 9528b2844c..a88c6feb34 100644
--- a/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
+++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
@@ -1,12 +1,69 @@
 <script>
-  import { store } from "builderStore"
+  import { store, selectedAccessRole } from "builderStore"
   import PathTree from "./PathTree.svelte"
 
-  $: paths = Object.keys($store.routes || {}).sort()
+  let routes = {}
+  $: paths = Object.keys(routes || {}).sort()
+
+  $: {
+    const allRoutes = $store.routes
+    const sortedPaths = Object.keys(allRoutes).sort()
+    const selectedRoleId = $selectedAccessRole
+    const selectedScreenId = $store.currentAssetId
+
+    let found = false
+    let firstValidScreenId
+    let filteredRoutes = {}
+
+    // Filter all routes down to only those which match the current role
+    sortedPaths.forEach(path => {
+      const config = allRoutes[path]
+      Object.entries(config.subpaths).forEach(([subpath, pathConfig]) => {
+        Object.entries(pathConfig.screens).forEach(([roleId, screenId]) => {
+          if (roleId === selectedRoleId) {
+            if (screenId === selectedScreenId) {
+              found = roleId === selectedRoleId
+            }
+            if (!firstValidScreenId) {
+              firstValidScreenId = screenId
+            }
+            if (!filteredRoutes[path]) {
+              filteredRoutes[path] = { subpaths: {} }
+            }
+            filteredRoutes[path].subpaths[subpath] = {
+              screens: {
+                [selectedRoleId]: screenId,
+              },
+            }
+          }
+        })
+      })
+    })
+    routes = filteredRoutes
+
+    // If the selected screen isn't in this filtered list, select the first one
+    if (!found && firstValidScreenId) {
+      store.actions.screens.select(firstValidScreenId)
+    }
+  }
 </script>
 
 <div class="root">
-  {#each paths as path}
-    <PathTree {path} route={$store.routes[path]} />
+  {#each paths as path, idx}
+    <PathTree border={idx > 0} {path} route={routes[path]} />
   {/each}
+
+  {#if !paths.length}
+    <div class="empty">
+      There aren't any screens configured with this access role.
+    </div>
+  {/if}
 </div>
+
+<style>
+  div.empty {
+    font-size: var(--font-size-xs);
+    color: var(--grey-5);
+    padding-top: var(--spacing-xs);
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
index 23d2e6cf1a..25f939d2f1 100644
--- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
@@ -1,13 +1,18 @@
 <script>
   import { onMount } from "svelte"
   import { goto, params, url } from "@sveltech/routify"
-  import { store, currentAsset, selectedComponent } from "builderStore"
+  import {
+    store,
+    currentAsset,
+    backendUiStore,
+    selectedAccessRole,
+  } from "builderStore"
   import { FrontendTypes } from "constants"
   import ComponentNavigationTree from "components/userInterface/ComponentNavigationTree/index.svelte"
   import Layout from "components/userInterface/Layout.svelte"
   import NewScreenModal from "components/userInterface/NewScreenModal.svelte"
   import NewLayoutModal from "components/userInterface/NewLayoutModal.svelte"
-  import { Modal, Switcher } from "@budibase/bbui"
+  import { Modal, Switcher, Select } from "@budibase/bbui"
 
   const tabs = [
     {
@@ -41,6 +46,19 @@
         on:click={modal.show}
         data-cy="new-screen"
         class="ri-add-circle-fill" />
+
+      <div class="role-select">
+        <Select
+          extraThin
+          secondary
+          bind:value={$selectedAccessRole}
+          label="Filter by Access">
+          {#each $backendUiStore.roles as role}
+            <option value={role._id}>{role.name}</option>
+          {/each}
+        </Select>
+      </div>
+
       {#if $currentAsset}
         <div class="nav-items-container">
           <ComponentNavigationTree />
@@ -54,8 +72,8 @@
         on:click={modal.show}
         data-cy="new-layout"
         class="ri-add-circle-fill" />
-      {#each $store.layouts as layout (layout._id)}
-        <Layout {layout} />
+      {#each $store.layouts as layout, idx (layout._id)}
+        <Layout {layout} border={idx > 0} />
       {/each}
       <Modal bind:this={modal}>
         <NewLayoutModal />
@@ -82,4 +100,8 @@
     cursor: pointer;
     color: var(--blue);
   }
+
+  .role-select {
+    margin-bottom: var(--spacing-m);
+  }
 </style>
diff --git a/packages/builder/src/components/userInterface/Layout.svelte b/packages/builder/src/components/userInterface/Layout.svelte
index d6d25b57a0..37593dedf7 100644
--- a/packages/builder/src/components/userInterface/Layout.svelte
+++ b/packages/builder/src/components/userInterface/Layout.svelte
@@ -10,6 +10,7 @@
   import { writable } from "svelte/store"
 
   export let layout
+  export let border
 
   let confirmDeleteDialog
   let componentToDelete = ""
@@ -23,7 +24,7 @@
 </script>
 
 <NavItem
-  border={false}
+  {border}
   icon="ri-layout-3-line"
   text={layout.name}
   withArrow
diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte
index 8d7271601a..d7e65a84b2 100644
--- a/packages/builder/src/components/userInterface/NewScreenModal.svelte
+++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte
@@ -111,7 +111,7 @@
     bind:value={route}
     on:change={routeChanged} />
   <Select label="Access" bind:value={roleId} secondary>
-    {#each $backendUiStore as role}
+    {#each $backendUiStore.roles as role}
       <option value={role._id}>{role.name}</option>
     {/each}
   </Select>