From a68247ffcbc0ead300629d9d3d5602de950e9e31 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 Nov 2021 09:39:40 +0000
Subject: [PATCH] fixng some auto screen bugs

---
 packages/builder/cypress/support/commands.js                 | 5 +----
 .../components/design/NavigationPanel/NewScreenModal.svelte  | 4 ++--
 .../components/design/NavigationPanel/ScreenWizard.svelte    | 4 ----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 2a5a7eb130..1b1cc0c2b0 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -195,10 +195,7 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
     cy.get("input").first().clear().type(screenName)
     cy.get("input").eq(1).clear().type(route)
     cy.get(".spectrum-Button--cta").click()
-  })
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get(`[data-cy="left-nav"]`).click()
-    cy.get(".spectrum-Button--cta").click()
+    cy.wait(2000)
   })
 })
 
diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index e9cedd66fb..cc8365f234 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -13,7 +13,6 @@
   $: blankSelected = selectedScreens?.length === 1
   $: autoSelected = selectedScreens?.length > 0 && !blankSelected
   let templates = getTemplates($store, $tables.list)
-
   const toggleScreenSelection = table => {
     if (selectedScreens.find(s => s.name.includes(table.name))) {
       selectedScreens = selectedScreens.filter(
@@ -26,6 +25,7 @@
       selectedScreens = [...partialTemplates, ...selectedScreens]
     }
   }
+  $: console.log($tables.list)
 </script>
 
 <ModalContent
@@ -61,7 +61,7 @@
     </div>
     <Detail size="S">Autogenerated Screens</Detail>
 
-    {#each $tables.list.filter(table => table.type !== "external") as table}
+    {#each $tables.list.filter(table => table.type !== "external" && table._id !== "ta_users") as table}
       <div
         class:disabled={blankSelected}
         class:selected={selectedScreens.find(x => x.name.includes(table.name))}
diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte b/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
index f3a2d5ca50..7018bc2ed4 100644
--- a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
@@ -1,5 +1,4 @@
 <script>
-  import NavigationSelectionModal from "components/design/NavigationPanel/NavigationSelectionModal.svelte"
   import ScreenDetailsModal from "components/design/NavigationPanel/ScreenDetailsModal.svelte"
   import NewScreenModal from "components/design/NavigationPanel/NewScreenModal.svelte"
   import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
@@ -116,6 +115,3 @@
 <Modal bind:this={screenDetailsModal}>
   <ScreenDetailsModal bind:screenName bind:url {save} {chooseModal} />
 </Modal>
-<Modal bind:this={navigationSelectionModal}>
-  <NavigationSelectionModal {chooseModal} {save} />
-</Modal>