diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 76f3417eac..ecb4eac6ce 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -111,7 +111,7 @@ Cypress.Commands.add("addRow", values => { }) }) -Cypress.Commands.add("createUser", (username, password, accessLevel) => { +Cypress.Commands.add("createUser", (username, password, role) => { // Create User cy.contains("Users").click() @@ -126,7 +126,7 @@ Cypress.Commands.add("createUser", (username, password, accessLevel) => { .type(username) cy.get("select") .first() - .select(accessLevel) + .select(role) // Save cy.get(".buttons") diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js index 523296e959..76df96ae0c 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js @@ -18,7 +18,7 @@ export class Screen extends BaseStructure { }, routing: { route: "", - accessLevelId: "", + roleId: "", }, name: "screen-id", } diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index 99539e965f..1a93ee3bb6 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -56,9 +56,7 @@ password: string().required( "Please enter a password for your first user." ), - accessLevelId: string().required( - "You need to select an access level for your user." - ), + roleId: string().required("You need to select a role for your user."), }, ] @@ -79,9 +77,7 @@ if (hasKey) { validationSchemas.shift() - validationSchemas = validationSchemas steps.shift() - steps = steps } // Handles form navigation @@ -166,7 +162,7 @@ name: $createAppStore.values.username, username: $createAppStore.values.username, password: $createAppStore.values.password, - accessLevelId: $createAppStore.values.accessLevelId, + roleId: $createAppStore.values.roleId, } const userResp = await api.post(`/api/users`, user) const json = await userResp.json() diff --git a/packages/builder/src/components/start/Steps/User.svelte b/packages/builder/src/components/start/Steps/User.svelte index edc1fdf40b..0bf9ce19cb 100644 --- a/packages/builder/src/components/start/Steps/User.svelte +++ b/packages/builder/src/components/start/Steps/User.svelte @@ -21,7 +21,7 @@ placeholder="Password" type="password" error={blurred.password && validationErrors.password} /> - diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte index 8615a6016e..1ecadebeb1 100644 --- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte +++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte @@ -18,7 +18,7 @@
- {#if $store.currentFrontEndType === "layout" || $allScreens.length} + {#if $store.currentFrontEndType === 'layout' || $allScreens.length}
@@ -67,8 +66,8 @@ - +