From ee6852ec15a7b441fe50a1c694447a4f390c452a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Sun, 6 Nov 2022 22:45:49 +0000
Subject: [PATCH] tidy up

---
 packages/builder/cypress/support/commands.js                  | 2 +-
 .../components/backend/DataTable/modals/CreateEditRow.svelte  | 3 ---
 .../src/pages/builder/app/[application]/data/_layout.svelte   | 4 +++-
 .../[screenId]/screens/_components/ScreenListPanel.svelte     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index b1fa629023..ae161e65a3 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -781,7 +781,7 @@ Cypress.Commands.add("selectExternalDatasource", datasourceName => {
   cy.navigateToDataSection()
   // Open Datasource modal
   cy.get(".nav").within(() => {
-    cy.get(".add-button").click()
+    cy.get("[data-cy='new-datasource']").click()
   })
   // Clicks specified datasource & continue
   cy.get(".item-list", { timeout: 1000 }).contains(datasourceName).click()
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index a30cf96e65..14abb1a772 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -32,9 +32,6 @@
         const response = error.json
         if (response?.errors) {
           errors = response.errors
-          // errors = Object.entries(response.errors)
-          //   .map(([key, error]) => ({ dataPath: key, message: error }))
-          //   .flat()
         } else if (response?.validationErrors) {
           const mappedErrors = {}
           for (let field in response.validationErrors) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index f2f34de523..ae0f74c649 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -24,7 +24,9 @@
     <Tabs {selected} on:select={selectFirstDatasource}>
       <Tab title="Sources">
         <Layout paddingX="L" paddingY="L" gap="S">
-          <Button cta wide on:click={modal.show}>Add source</Button>
+          <Button dataCy={`new-datasource`} cta wide on:click={modal.show}
+            >Add source</Button
+          >
         </Layout>
         <CreateDatasourceModal bind:modal />
         <DatasourceNavigator />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
index 22e354b135..a6fd9089b1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <Panel title="Screens" borderRight>
-  <Layout paddingX="L" paddingY="L" gap="S">
+  <Layout paddingX="L" paddingY="XL" gap="S">
     <Button on:click={showNewScreenModal} cta>Add screen</Button>
     <Search
       placeholder="Search"