diff --git a/packages/builder/src/components/common/CreationPage.svelte b/packages/builder/src/components/common/CreationPage.svelte
new file mode 100644
index 0000000000..9631e9d961
--- /dev/null
+++ b/packages/builder/src/components/common/CreationPage.svelte
@@ -0,0 +1,39 @@
+
+
+
+
+ {#if showClose}
+
+ {/if}
+
+
+ {heading}
+
+
+
+
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte
rename to packages/builder/src/components/design/ScreenDetailsModal.svelte
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index f29b7067c3..9e831f5bd9 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -15,8 +15,6 @@
import { createValidationStore } from "helpers/validation/yup"
import * as appValidation from "helpers/validation/yup/app"
import TemplateCard from "components/common/TemplateCard.svelte"
- import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
- import { Roles } from "constants/backend"
import { lowercase } from "helpers"
export let template
@@ -142,21 +140,6 @@
// Create user
await auth.setInitInfo({})
- // Create a default home screen if no template was selected
- if (template == null) {
- let defaultScreenTemplate = createFromScratchScreen.create()
- defaultScreenTemplate.routing.route = "/home"
- defaultScreenTemplate.routing.roldId = Roles.BASIC
- try {
- await store.actions.screens.save(defaultScreenTemplate)
- } catch (err) {
- console.error("Could not create a default application screen", err)
- notifications.warning(
- "Encountered an issue creating the default screen."
- )
- }
- }
-
$goto(`/builder/app/${createdApp.instance._id}`)
} catch (error) {
creating = false
diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
index 4eb9ce16e1..c5090229b3 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@@ -7,12 +7,13 @@
} from "stores/backend"
import { hasData } from "stores/selectors"
- import { Icon, notifications, Heading, Body } from "@budibase/bbui"
+ import { notifications, Body } from "@budibase/bbui"
import { params, goto } from "@roxi/routify"
import CreateExternalDatasourceModal from "./_components/CreateExternalDatasourceModal/index.svelte"
import CreateInternalTableModal from "./_components/CreateInternalTableModal.svelte"
import DatasourceOption from "./_components/DatasourceOption.svelte"
import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+ import CreationPage from "components/common/CreationPage.svelte"
import ICONS from "components/backend/DatasourceNavigator/icons/index.js"
import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
@@ -46,16 +47,11 @@
bind:this={externalDatasourceModal}
/>
-
-
- {#if hasData($datasources, $tables)}
-
- {/if}
-
-
- Add new data source
-
-
+
$goto("./table")}
+ heading="Add new data source"
+>
Get started with our Budibase DB
{/each}
-
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
index ec965ed659..fd5ddd9459 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
@@ -9,7 +9,7 @@
Helpers,
notifications,
} from "@budibase/bbui"
- import ScreenDetailsModal from "./ScreenDetailsModal.svelte"
+ import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
import { makeComponentUnique } from "builderStore/componentUtils"
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 92a88abb13..6362af3073 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
@@ -1,17 +1,16 @@
-
-
-
-
newScreenModal.show()}
initalScreens={!selectedTemplates ? [] : [...selectedTemplates]}
/>
@@ -198,7 +194,6 @@
newScreenModal.show()}
initialUrl={blankScreenUrl}
/>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/DatasourceModal.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/_components/DatasourceModal.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenRoleModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/ScreenRoleModal.svelte
similarity index 93%
rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenRoleModal.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/_components/ScreenRoleModal.svelte
index cde8047b97..5d73b7961c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenRoleModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/ScreenRoleModal.svelte
@@ -40,14 +40,14 @@
- Select which level of access you want your screens to have
+ Select the level of access required to see these screens