From 55a68890af40972aae221b09a5933787b89019ea Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 15 Mar 2022 11:18:34 +0000 Subject: [PATCH 001/179] Add nord theme --- packages/frontend-core/src/themes/nord.css | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 packages/frontend-core/src/themes/nord.css diff --git a/packages/frontend-core/src/themes/nord.css b/packages/frontend-core/src/themes/nord.css new file mode 100644 index 0000000000..113adfb853 --- /dev/null +++ b/packages/frontend-core/src/themes/nord.css @@ -0,0 +1,46 @@ +.spectrum--nord { + --spectrum-global-color-red-400: #bf616a; + --spectrum-global-color-red-500: #c26971; + --spectrum-global-color-red-600: #c57179; + --spectrum-global-color-red-700: #c97980; + --spectrum-global-color-static-red-400: #bf616a; + --spectrum-global-color-static-red-500: #c26971; + --spectrum-global-color-static-red-600: #c57179; + --spectrum-global-color-static-red-700: #c97980; + + --spectrum-global-color-green-400: #719453; + --spectrum-global-color-green-500: #789d58; + --spectrum-global-color-green-600: #7fa55e; + --spectrum-global-color-green-700: #86aa67; + --spectrum-global-color-static-green-400: #719453; + --spectrum-global-color-static-green-500: #789d58; + --spectrum-global-color-static-green-600: #7fa55e; + --spectrum-global-color-static-green-700: #86aa67; + + --spectrum-global-color-blue-400: #5680b4; + --spectrum-global-color-blue-500: #5e86b8; + --spectrum-global-color-blue-600: #668dbb; + --spectrum-global-color-blue-700: #6f93bf; + --spectrum-global-color-static-blue-200: #7799c4; + --spectrum-global-color-static-blue-300: #6f93bf; + --spectrum-global-color-static-blue-400: #668dbb; + --spectrum-global-color-static-blue-500: #5e86b8; + --spectrum-global-color-static-blue-600: #5680b4; + --spectrum-global-color-static-blue-700: #4e79af; + --spectrum-global-color-static-blue-800: #4a73a6; + + --spectrum-global-color-gray-50: #2e3440; + --spectrum-global-color-gray-75: #353b4a; + --spectrum-global-color-gray-100: #3b4252; + --spectrum-global-color-gray-200: #4a5367; + --spectrum-global-color-gray-300: #4c566a; + --spectrum-global-color-gray-400: #5a657d; + --spectrum-global-color-gray-500: #677590; + --spectrum-global-color-gray-600: #79869f; + --spectrum-global-color-gray-700: #a9b1c1; + --spectrum-global-color-gray-800: #bac1cd; + --spectrum-global-color-gray-900: #eceff4; + + --spectrum-alias-highlight-hover: rgba(169, 177, 193, 0.06); + --spectrum-alias-highlight-active: rgba(169, 177, 193, 0.1); +} From 3acea6b14832ac5b83ed4cd246e30e1e70c6579e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 15 Mar 2022 11:20:06 +0000 Subject: [PATCH 002/179] Add nord theme --- packages/builder/src/builderStore/store/theme.js | 4 ++++ .../components/design/AppPreview/AppThemeSelect.svelte | 4 ++++ packages/builder/src/main.js | 1 + packages/client/src/components/ClientApp.svelte | 2 +- packages/client/src/components/app/index.js | 8 +++++--- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/builderStore/store/theme.js b/packages/builder/src/builderStore/store/theme.js index d4d7460ed2..77b84ca78c 100644 --- a/packages/builder/src/builderStore/store/theme.js +++ b/packages/builder/src/builderStore/store/theme.js @@ -21,6 +21,10 @@ export const getThemeStore = () => { `spectrum--${option}`, option === state.theme ) + + // Ensure darkest is always added as this is the base class for custom + // themes + themeElement.classList.add("spectrum--darkest") }) }) diff --git a/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte b/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte index cdab47db66..59a8671bfd 100644 --- a/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte +++ b/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte @@ -20,6 +20,10 @@ label: "Darkest", value: "spectrum--darkest", }, + { + label: "Nord", + value: "spectrum--nord", + }, ] const onChangeTheme = async theme => { diff --git a/packages/builder/src/main.js b/packages/builder/src/main.js index bc5ec4f009..8ab2c16ba2 100644 --- a/packages/builder/src/main.js +++ b/packages/builder/src/main.js @@ -5,6 +5,7 @@ import "@spectrum-css/vars/dist/spectrum-darkest.css" import "@spectrum-css/vars/dist/spectrum-dark.css" import "@spectrum-css/vars/dist/spectrum-light.css" import "@spectrum-css/vars/dist/spectrum-lightest.css" +import "@budibase/frontend-core/src/themes/nord.css" import "@spectrum-css/page/dist/index-vars.css" import "./global.css" import { suppressWarnings } from "./helpers/warnings" diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index e8ed7e9538..8af065f972 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -77,7 +77,7 @@ id="spectrum-root" lang="en" dir="ltr" - class="spectrum spectrum--medium {$themeStore.theme}" + class="spectrum spectrum--medium spectrum--darkest {$themeStore.theme}" > {#if permissionError}
diff --git a/packages/client/src/components/app/index.js b/packages/client/src/components/app/index.js index 5af62201e5..71acee5eff 100644 --- a/packages/client/src/components/app/index.js +++ b/packages/client/src/components/app/index.js @@ -1,10 +1,11 @@ import "@spectrum-css/vars/dist/spectrum-global.css" import "@spectrum-css/vars/dist/spectrum-medium.css" import "@spectrum-css/vars/dist/spectrum-large.css" -import "@spectrum-css/vars/dist/spectrum-lightest.css" -import "@spectrum-css/vars/dist/spectrum-light.css" -import "@spectrum-css/vars/dist/spectrum-dark.css" import "@spectrum-css/vars/dist/spectrum-darkest.css" +import "@spectrum-css/vars/dist/spectrum-dark.css" +import "@spectrum-css/vars/dist/spectrum-light.css" +import "@spectrum-css/vars/dist/spectrum-lightest.css" +import "@budibase/frontend-core/src/themes/nord.css" import "@spectrum-css/page/dist/index-vars.css" // Non user-facing components @@ -34,6 +35,7 @@ export { default as markdownviewer } from "./MarkdownViewer.svelte" export * from "./charts" export * from "./forms" export * from "./table" + export * from "./blocks" export * from "./dynamic-filter" From b3227fe51e28f60a0ebc3a7b2820b447e866b2eb Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 14 Jun 2022 14:56:09 +0100 Subject: [PATCH 003/179] add IconPicker component --- .../bbui/src/IconPicker/IconPicker.svelte | 176 ++++++++++++++++++ packages/bbui/src/index.js | 1 + 2 files changed, 177 insertions(+) create mode 100644 packages/bbui/src/IconPicker/IconPicker.svelte diff --git a/packages/bbui/src/IconPicker/IconPicker.svelte b/packages/bbui/src/IconPicker/IconPicker.svelte new file mode 100644 index 0000000000..995394adca --- /dev/null +++ b/packages/bbui/src/IconPicker/IconPicker.svelte @@ -0,0 +1,176 @@ + + +
+
(open = true)}> +
+ +
+
+ {#if open} +
(open = false)} + transition:fly={{ y: -20, duration: 200 }} + class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" + class:spectrum-Popover--align-right={alignRight} + > + {#each iconList as icon} +
+
{icon.label}
+
+ {#each icon.icons as icon} +
{ + value = icon + }} + > + +
+ {/each} +
+
+ {/each} +
+ {/if} +
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 2b16f32b84..97dc88030e 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -58,6 +58,7 @@ export { default as Pagination } from "./Pagination/Pagination.svelte" export { default as Badge } from "./Badge/Badge.svelte" export { default as StatusLight } from "./StatusLight/StatusLight.svelte" export { default as ColorPicker } from "./ColorPicker/ColorPicker.svelte" +export { default as IconPicker } from "./IconPicker/IconPicker.svelte" export { default as InlineAlert } from "./InlineAlert/InlineAlert.svelte" export { default as Banner } from "./Banner/Banner.svelte" export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte" From d529d7456fdebaee18e7006f22fcc1bdf78c0b1d Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 14 Jun 2022 14:57:34 +0100 Subject: [PATCH 004/179] add user groups UI --- .../bbui/src/IconPicker/IconPicker.svelte | 7 +- .../src/pages/builder/portal/_layout.svelte | 5 + .../builder/portal/manage/_layout.svelte | 6 +- .../portal/manage/groups/[groupId].svelte | 211 ++++++++++++++++++ .../groups/_components/UserGroupsRow.svelte | 92 ++++++++ .../manage/groups/_components/UserRow.svelte | 55 +++++ .../portal/manage/groups/_layout.svelte | 3 + .../builder/portal/manage/groups/index.svelte | 155 +++++++++++++ 8 files changed, 530 insertions(+), 4 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/index.svelte diff --git a/packages/bbui/src/IconPicker/IconPicker.svelte b/packages/bbui/src/IconPicker/IconPicker.svelte index 995394adca..954145b42d 100644 --- a/packages/bbui/src/IconPicker/IconPicker.svelte +++ b/packages/bbui/src/IconPicker/IconPicker.svelte @@ -1,5 +1,5 @@
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index ae0362af72..5da8b34700 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -52,6 +52,11 @@ href: "/builder/portal/manage/users", heading: "Manage", }, + { + title: "User Groups", + href: "/builder/portal/manage/groups", + }, + { title: "Auth", href: "/builder/portal/manage/auth" }, { title: "Email", href: "/builder/portal/manage/email" }, { diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte index b4ffa4910c..47d9aaf59e 100644 --- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte @@ -9,10 +9,14 @@ $redirect("../") } } + + $: wide = + $page.path.includes("email/:template") || + ($page.path.includes("groups") && !$page.path.includes(":groupId")) {#if $auth.isAdmin} - + {/if} diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte new file mode 100644 index 0000000000..d33f144680 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -0,0 +1,211 @@ + + + +
+ $goto("../groups")} size="S" icon="ArrowLeft"> + Back + +
+
+
+
+
+ +
+
+
+ {group.name} +
+
+
+ +
+ +
+ +
+
+ {filteredUsers.length} User{filteredUsers.length === 1 + ? "" + : "s"} +
+
+ Add all +
+
+ +
+ {#each filteredUsers as user} +
+
+ {user.email} +
+ + {#if selectedUsers.includes(user._id)} +
+ +
+ {/if} +
+ {/each} +
+
+ +
+ +
+ {#if groupUsers.length} + {#each groupUsers as user} +
+ +
+ {/each} + {:else} +
+
+ +
+ You have no users in this team +
+
+
+ {/if} +
+ + + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte new file mode 100644 index 0000000000..c4f38f080b --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -0,0 +1,92 @@ + + +
+
+
+
+ +
+
+
{name}
+
+
+
+ +
+ {parseInt(userCount)} app{parseInt(userCount) === 1 ? "" : "s"} +
+
+
+ + +
+ {parseInt(appCount)} app{parseInt(appCount) === 1 ? "" : "s"} +
+
+
+
+
+ +
+
+
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte new file mode 100644 index 0000000000..873b45e151 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte @@ -0,0 +1,55 @@ + + +
+
+
+ +
+
+
+
+
+ {user.email} +
+ {user.access} +
+
+
+
+
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte new file mode 100644 index 0000000000..a13211a9bb --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte @@ -0,0 +1,3 @@ +
+ +
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte new file mode 100644 index 0000000000..63fcd105f3 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -0,0 +1,155 @@ + + + + +
+ User groups + {#if !proPlan} + +
+
+ Pro plan +
+
+ + {/if} +
+ Easily assign and manage your users access with User Groups + +
+ + {#if !proPlan} + + {/if} +
+ +
+ {#each userGroupData as group} +
+ +
+ {/each} +
+ + + + + +
+
+ Icon +
+ +
+
+
+ Color +
+ (selectedColor = e.detail)} + /> +
+
+
+ + + + From b7cc71a62385ad8609fe8af8b49f3b34f93a8bdd Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 15 Jun 2022 16:51:30 +0100 Subject: [PATCH 005/179] saving and fetching groups from couch --- .vscode/settings.json | 5 +- packages/backend-core/src/db/constants.js | 1 + packages/backend-core/src/db/utils.js | 23 ++++++++ .../groups/_components/UserGroupsRow.svelte | 2 +- .../builder/portal/manage/groups/index.svelte | 54 ++++++++++------- packages/builder/src/stores/portal/groups.js | 24 ++++++++ packages/builder/src/stores/portal/index.js | 1 + packages/frontend-core/src/api/groups.js | 18 ++++++ packages/frontend-core/src/api/index.js | 2 + .../src/api/controllers/global/groups.js | 58 +++++++++++++++++++ .../worker/src/api/routes/global/groups.js | 27 +++++++++ packages/worker/src/api/routes/index.js | 3 +- 12 files changed, 194 insertions(+), 24 deletions(-) create mode 100644 packages/builder/src/stores/portal/groups.js create mode 100644 packages/frontend-core/src/api/groups.js create mode 100644 packages/worker/src/api/controllers/global/groups.js create mode 100644 packages/worker/src/api/routes/global/groups.js diff --git a/.vscode/settings.json b/.vscode/settings.json index d471924fe0..f93d3f0886 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,8 @@ "editor.codeActionsOnSave": { "source.fixAll": true }, - "editor.defaultFormatter": "svelte.svelte-vscode" + "editor.defaultFormatter": "svelte.svelte-vscode", + "[javascript]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + } } diff --git a/packages/backend-core/src/db/constants.js b/packages/backend-core/src/db/constants.js index 271d4f412d..0f3daa918c 100644 --- a/packages/backend-core/src/db/constants.js +++ b/packages/backend-core/src/db/constants.js @@ -15,6 +15,7 @@ exports.DocumentTypes = { ROLE: "role", MIGRATIONS: "migrations", DEV_INFO: "devinfo", + GROUP: "gr" } exports.StaticDatabases = { diff --git a/packages/backend-core/src/db/utils.js b/packages/backend-core/src/db/utils.js index d6eb0aa89e..212ada6e9a 100644 --- a/packages/backend-core/src/db/utils.js +++ b/packages/backend-core/src/db/utils.js @@ -148,6 +148,29 @@ exports.getTemplateParams = (ownerId, templateId, otherProps = {}) => { } } +/** + * Generates a new user group ID + * @returns {string} The new user group ID which info can be stored under. + */ +exports.generateUserGroupID = () => { + return `${DocumentTypes.GROUP}${SEPARATOR}${newid()}` +} + +/** + * Gets parameters for retrieving groups. + */ +exports.getUserGroupsParams = (groupId, otherProps = {}) => { + if (!groupId) { + groupId = "" + } + return { + ...otherProps, + startkey: `${DocumentTypes.GROUP}${SEPARATOR}${groupId}`, + endkey: `${DocumentTypes.GROUP}${SEPARATOR}${groupId}${UNICODE_MAX}`, + } +} + + /** * Generates a new role ID. * @returns {string} The new role ID which the role doc can be stored under. diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte index c4f38f080b..a8fef775bf 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -20,7 +20,7 @@
- {parseInt(userCount)} app{parseInt(userCount) === 1 ? "" : "s"} + {parseInt(userCount)} user{parseInt(userCount) === 1 ? "" : "s"}
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 63fcd105f3..560cf273e5 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -12,30 +12,37 @@ Tags, IconPicker, } from "@budibase/bbui" + import { API } from "api" + import { groups } from "stores/portal" + import { onMount } from "svelte" + import UserGroupsRow from "./_components/UserGroupsRow.svelte" + let modal let selectedColor let selectedIcon + let groupName let proPlan = true - let userGroupData = [ - { - _id: "gr_123456", - color: "green", - icon: "Anchor", - name: "Core Team", - userCount: 5, - appCount: 2, - }, - { - _id: "gr_45678", - color: "red", - icon: "Beaker", - name: "QA Team", - userCount: 3, - appCount: 7, - }, - ] + async function saveConfig() { + try { + API.saveGroup({ + color: selectedColor, + icon: selectedIcon, + name: groupName, + }) + } catch (error) { + notifications.error(`Failed to save group`) + } + } + + onMount(async () => { + try { + await groups.init() + } catch (error) { + notifications.error("Error getting User groups") + } + }) @@ -72,7 +79,7 @@
- {#each userGroupData as group} + {#each $groups as group}
@@ -81,8 +88,13 @@ - - + +
Icon diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js new file mode 100644 index 0000000000..417438973d --- /dev/null +++ b/packages/builder/src/stores/portal/groups.js @@ -0,0 +1,24 @@ +import { writable } from "svelte/store" +import { API } from "api" +import { update } from "lodash" + +export function createGroupsStore() { + const { subscribe, set } = writable([]) + + async function init() { + const users = await API.getGroups() + set(users) + } + + async function save(data) { + await API.saveGroup(data) + } + + return { + subscribe, + init, + save, + } +} + +export const groups = createGroupsStore() diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 8810ce6b74..2f6ee7cbde 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -7,3 +7,4 @@ export { auth } from "./auth" export { oidc } from "./oidc" export { templates } from "./templates" export { licensing } from "./licensing" +export { groups } from "./groups" \ No newline at end of file diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.js new file mode 100644 index 0000000000..2462a491c5 --- /dev/null +++ b/packages/frontend-core/src/api/groups.js @@ -0,0 +1,18 @@ +export const buildGroupsEndpoints = API => ({ + /** + * Creates or updates a user in the current tenant. + * @param user the new user to create + */ + saveGroup: async group => { + return await API.post({ + url: "/api/global/groups", + body: group, + }) + }, + getGroups: async () => { + return await API.get({ + url: "/api/global/groups", + }) + + } +}) diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index 164f51aae5..85c0905bd6 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -23,6 +23,7 @@ import { buildUserEndpoints } from "./user" import { buildSelfEndpoints } from "./self" import { buildViewEndpoints } from "./views" import { buildLicensingEndpoints } from "./licensing" +import { buildGroupsEndpoints } from "./groups" const defaultAPIClientConfig = { /** @@ -235,5 +236,6 @@ export const createAPIClient = config => { ...buildViewEndpoints(API), ...buildSelfEndpoints(API), ...buildLicensingEndpoints(API), + ...buildGroupsEndpoints(API) } } diff --git a/packages/worker/src/api/controllers/global/groups.js b/packages/worker/src/api/controllers/global/groups.js new file mode 100644 index 0000000000..424c112822 --- /dev/null +++ b/packages/worker/src/api/controllers/global/groups.js @@ -0,0 +1,58 @@ +const { + generateUserGroupID, + getUserGroupsParams +} = require("@budibase/backend-core/db") +const { Configs } = require("../../../constants") +const email = require("../../../utilities/email") +const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy") +const env = require("../../../environment") +const { + withCache, + CacheKeys, + bustCache, +} = require("@budibase/backend-core/cache") + + +exports.save = async function (ctx) { + const db = getGlobalDB() + + // Config does not exist yet + if (!ctx.request.body._id) { + ctx.request.body._id = generateUserGroupID(ctx.request.body.name) + } + + try { + const response = await db.put(ctx.request.body) + ctx.body = { + _id: response.id, + _rev: response.rev, + } + } catch (err) { + ctx.throw(400, err) + } +} + +exports.fetch = async function (ctx) { + const db = getGlobalDB() + console.log('in here') + const response = await db.allDocs( + getUserGroupsParams(null, { + include_docs: true, + }) + ) + ctx.body = response.rows.map(row => row.doc) + +} + + +exports.destroy = async function (ctx) { + const db = getGlobalDB() + const { id, rev } = ctx.params + + try { + await db.remove(id, rev) + ctx.body = { message: "Group deleted successfully" } + } catch (err) { + ctx.throw(err.status, err) + } +} diff --git a/packages/worker/src/api/routes/global/groups.js b/packages/worker/src/api/routes/global/groups.js new file mode 100644 index 0000000000..c468531a86 --- /dev/null +++ b/packages/worker/src/api/routes/global/groups.js @@ -0,0 +1,27 @@ +const Router = require("@koa/router") +const controller = require("../../controllers/global/groups") +const joiValidator = require("../../../middleware/joi-validator") +const adminOnly = require("../../../middleware/adminOnly") +const Joi = require("joi") + +const router = Router() + +function buildGroupSaveValidation() { + // prettier-ignore + return joiValidator.body(Joi.object({ + color: Joi.string().required(), + icon: Joi.string().required(), + name: Joi.string().required() + }).required()) +} + +router.post( + "/api/global/groups", + adminOnly, + buildGroupSaveValidation(), + controller.save +) + .get("/api/global/groups", controller.fetch) + + +module.exports = router diff --git a/packages/worker/src/api/routes/index.js b/packages/worker/src/api/routes/index.js index c351455a0d..b85b18deb7 100644 --- a/packages/worker/src/api/routes/index.js +++ b/packages/worker/src/api/routes/index.js @@ -11,7 +11,7 @@ const tenantsRoutes = require("./system/tenants") const statusRoutes = require("./system/status") const selfRoutes = require("./global/self") const licenseRoutes = require("./global/license") - +const userGroupRoutes = require("./global/groups") exports.routes = [ configRoutes, userRoutes, @@ -26,4 +26,5 @@ exports.routes = [ statusRoutes, selfRoutes, licenseRoutes, + userGroupRoutes ] From d952b9a3bb953614caec7e994cbc90622392b0e4 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 22 Jun 2022 13:55:31 +0100 Subject: [PATCH 006/179] updated store and finished groups tab --- packages/backend-core/src/db/constants.js | 2 +- packages/backend-core/src/db/utils.js | 1 - .../bbui/src/IconPicker/IconPicker.svelte | 8 +- .../portal/manage/groups/[groupId].svelte | 111 +++++++++++++----- .../_components/CreateEditGroupModal.svelte | 58 +++++++++ .../groups/_components/GroupAppsRow.svelte | 58 +++++++++ .../groups/_components/UserGroupsRow.svelte | 57 +++++++-- .../manage/groups/_components/UserRow.svelte | 8 +- .../builder/portal/manage/groups/index.svelte | 72 +++--------- packages/builder/src/stores/portal/groups.js | 50 +++++--- packages/builder/src/stores/portal/index.js | 2 +- packages/frontend-core/src/api/groups.js | 52 +++++--- packages/frontend-core/src/api/index.js | 2 +- .../src/api/controllers/global/groups.js | 58 --------- .../src/api/controllers/global/groups.ts | 66 +++++++++++ .../worker/src/api/routes/global/groups.js | 25 ++-- packages/worker/src/api/routes/index.js | 2 +- 17 files changed, 425 insertions(+), 207 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/CreateEditGroupModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte delete mode 100644 packages/worker/src/api/controllers/global/groups.js create mode 100644 packages/worker/src/api/controllers/global/groups.ts diff --git a/packages/backend-core/src/db/constants.js b/packages/backend-core/src/db/constants.js index 0f3daa918c..4f2f1f556a 100644 --- a/packages/backend-core/src/db/constants.js +++ b/packages/backend-core/src/db/constants.js @@ -15,7 +15,7 @@ exports.DocumentTypes = { ROLE: "role", MIGRATIONS: "migrations", DEV_INFO: "devinfo", - GROUP: "gr" + GROUP: "gr", } exports.StaticDatabases = { diff --git a/packages/backend-core/src/db/utils.js b/packages/backend-core/src/db/utils.js index 212ada6e9a..3e879cd004 100644 --- a/packages/backend-core/src/db/utils.js +++ b/packages/backend-core/src/db/utils.js @@ -170,7 +170,6 @@ exports.getUserGroupsParams = (groupId, otherProps = {}) => { } } - /** * Generates a new role ID. * @returns {string} The new role ID which the role doc can be stored under. diff --git a/packages/bbui/src/IconPicker/IconPicker.svelte b/packages/bbui/src/IconPicker/IconPicker.svelte index 954145b42d..0b96cbe4c9 100644 --- a/packages/bbui/src/IconPicker/IconPicker.svelte +++ b/packages/bbui/src/IconPicker/IconPicker.svelte @@ -4,6 +4,7 @@ import clickOutside from "../Actions/click_outside" import { fly } from "svelte/transition" import Icon from "../Icon/Icon.svelte" + import { createEventDispatcher } from "svelte" export let value = "Anchor" export let size = "M" @@ -11,7 +12,7 @@ let open = false - // const dispatch = createEventDispatcher() + const dispatch = createEventDispatcher() const iconList = [ { @@ -44,12 +45,11 @@ ], }, ] - /* + const onChange = value => { dispatch("change", value) open = false } -*/
@@ -76,7 +76,7 @@ {#each icon.icons as icon}
{ - value = icon + onChange(icon) }} > diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte index d33f144680..21169c6513 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -11,50 +11,66 @@ Search, Divider, Detail, + notifications, } from "@budibase/bbui" import UserRow from "./_components/UserRow.svelte" - import { users } from "stores/portal" + import { users, apps, groups } from "stores/portal" import { onMount } from "svelte" + import GroupAppsRow from "./_components/GroupAppsRow.svelte" + export let groupId let popoverAnchor let popover + $: group = $groups.find(x => x._id === groupId) let searchTerm = "" let selectedUsers = [] - $: filteredUsers = $users.filter(user => - user?.email?.toLowerCase().includes(searchTerm.toLowerCase()) + $: filteredUsers = $users.filter( + user => + selectedUsers && + user?.email?.toLowerCase().includes(searchTerm.toLowerCase()) ) - - let group = { - _id: "gr_123456", - color: "green", - icon: "Anchor", - name: "Core Team", - userCount: 5, - appCount: 2, - } - - let groupUsers = [ + let app_list = [ { - email: "peter@budibase.com", access: "Developer", + name: "test app", + icon: "Anchor", + color: "blue", }, ] - /* - function getGroup() { - return + async function addAll() { + selectedUsers = [...selectedUsers, ...filteredUsers] + group.users = selectedUsers + await groups.actions.save(group) } - */ - function selectUser(id) { - let user = selectedUsers.find(user_id => user_id === id) - if (user) { - selectedUsers = selectedUsers.filter(id => id !== user) + + async function selectUser(id) { + let selectedUser = selectedUsers.find(user_id => user_id === id) + let enrichedUser = $users.find(user => user._id === id) + if (selectedUser) { + selectedUsers = selectedUsers.filter(id => id !== selectedUser) + let newUsers = group.users.filter(user => user._id !== id) + group.users = newUsers } else { selectedUsers = [...selectedUsers, id] + group.users.push(enrichedUser) } + await groups.actions.save(group) } - onMount(() => { - console.log($users) + + async function removeUser(id) { + let newUsers = group.users.filter(user => user._id !== id) + group.users = newUsers + await groups.actions.save(group) + } + onMount(async () => { + try { + await groups.actions.init() + await users.init() + await apps.load() + } catch (error) { + notifications.error("Error fetching User Group data") + } }) @@ -66,13 +82,13 @@
-
+
- +
- {group.name} + {group?.name}
@@ -90,7 +106,9 @@ >
- Add all + Add all
@@ -121,10 +139,39 @@
- {#if groupUsers.length} - {#each groupUsers as user} + {#if group?.users.length} + {#each group.users as user}
- + +
+ {/each} + {:else} +
+
+ +
+ You have no users in this team +
+
+
+ {/if} +
+
+ Apps +
+ Manage apps that this User group has been assigned to +
+
+ +
+ {#if app_list.length} + {#each app_list as app} +
+
{/each} {:else} diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/CreateEditGroupModal.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/CreateEditGroupModal.svelte new file mode 100644 index 0000000000..c34731d0e5 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/CreateEditGroupModal.svelte @@ -0,0 +1,58 @@ + + + saveGroup(group)} + size="M" + title="Create User Group" + confirmText="Save" +> + +
+
+ Icon +
+ (group.icon = e.detail)} + bind:value={group.icon} + /> +
+
+
+ Color +
+ (group.color = e.detail)} + /> +
+
+
+ + + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte new file mode 100644 index 0000000000..6c400c03fe --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte @@ -0,0 +1,58 @@ + + +
+
+
+ +
+
+
+
+
+ {app.name} +
+ {app.access} +
+
+
+
+
+ + {app.access} +
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte index a8fef775bf..ff3519516f 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -1,50 +1,87 @@
-
+
- +
-
{name}
+
+ {group.name} +
- {parseInt(userCount)} user{parseInt(userCount) === 1 ? "" : "s"} + {parseInt(group.userCount) || 0} user{parseInt(group.userCount) === 1 + ? "" + : "s"}
-
- {parseInt(appCount)} app{parseInt(appCount) === 1 ? "" : "s"} +
+ {parseInt(group.appCount) || 0} app{parseInt(group.appCount) === 1 + ? "" + : "s"}
-
+
+
+ + + + + deleteGroup(group)} icon="Delete" + >Delete + editGroup(group)} icon="Delete">Edit + +
+ + + + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte new file mode 100644 index 0000000000..57bd834803 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte @@ -0,0 +1,29 @@ + + +
+
+ +
+ {#if value?.groups?.length === 0} +
+
No groups
+
+ {:else if value?.groups?.length === 1} + {value.groups[0]?.name} + {:else} + {parseInt(value?.groups?.length) || 0} + {/if} +
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte new file mode 100644 index 0000000000..c80bead9f8 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte @@ -0,0 +1,29 @@ + + +
+ {#if value?.name} +
+ +
+ {value.name} + {:else} +
Invite pending...
+ {/if} +
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 50d4031af4..669b82e48d 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -1,12 +1,9 @@
+ + From 36c8d91997f04e59af2c261aab8613e8124de355 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 24 Jun 2022 14:10:13 +0100 Subject: [PATCH 010/179] Pull in picker changes from new design UI --- packages/bbui/src/Form/Core/Picker.svelte | 210 ++++++++++++---------- packages/bbui/src/Form/Core/Select.svelte | 41 ++--- packages/bbui/src/Form/Select.svelte | 2 + 3 files changed, 131 insertions(+), 122 deletions(-) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 2585f11939..a3b5c147e5 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -6,12 +6,15 @@ import { createEventDispatcher } from "svelte" import clickOutside from "../../Actions/click_outside" import Search from "./Search.svelte" + import Icon from "../../Icon/Icon.svelte" + import StatusLight from "../../StatusLight/StatusLight.svelte" export let id = null export let disabled = false export let error = null export let fieldText = "" export let fieldIcon = "" + export let fieldColour = "" export let isPlaceholder = false export let placeholderOption = null export let options = [] @@ -20,6 +23,7 @@ export let getOptionLabel = option => option export let getOptionValue = option => option export let getOptionIcon = () => null + export let getOptionColour = () => null export let open = false export let readonly = false export let quiet = false @@ -43,7 +47,7 @@ return } searchTerm = null - open = !open + open = true } const getSortedOptions = (options, getLabel, sort) => { @@ -71,73 +75,104 @@ } -
(open = false)}> - - {#if open} -
- {#if autocomplete} - (searchTerm = event.detail)} - {disabled} - placeholder="Search" - /> + {/if} + {#if fieldColour} + + + + {/if} + + +{#if open} +
(open = false)} + transition:fly|local={{ y: -20, duration: 200 }} + class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" + class:auto-width={autoWidth} + > + {#if autocomplete} + (searchTerm = event.detail)} + {disabled} + placeholder="Search" + /> + {/if} +
    + {#if placeholderOption} +
  • onSelectOption(null)} + > + {placeholderOption} + +
    • {/if} -
      - {#if placeholderOption} + {#if filteredOptions.length} + {#each filteredOptions as option, idx}
    • onSelectOption(null)} + on:click={() => onSelectOption(getOptionValue(option, idx))} > - {placeholderOption} + {#if getOptionIcon(option, idx)} + + + + {/if} + + {getOptionLabel(option, idx)} + -
      • - {/if} - {#if filteredOptions.length} - {#each filteredOptions as option, idx} -
    • onSelectOption(getOptionValue(option, idx))} - > - {#if getOptionIcon(option, idx)} - - icon - - {/if} - - {getOptionLabel(option, idx)} + {#if getOptionColour(option, idx)} + + - -
      • - {/each} - {/if} -
    -
- {/if} -
+ {/if} + + {/each} + {/if} + +
+{/if} diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte new file mode 100644 index 0000000000..0ead895893 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte @@ -0,0 +1,13 @@ + + +
+ + + + + Delete + Edit + +
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 669b82e48d..c16a9a897f 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -5,27 +5,26 @@ Button, ButtonGroup, Table, - Label, Layout, Modal, Icon, notifications, } from "@budibase/bbui" - import AddUserModal from "./_components/AddUserModal.svelte" import BasicOnboardingModal from "./_components/BasicOnboardingModal.svelte" import { users, groups } from "stores/portal" import { onMount } from "svelte" import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte" import AppsTableRenderer from "./_components/AppsTableRenderer.svelte" import NameTableRenderer from "./_components/NameTableRenderer.svelte" + import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" const schema = { name: {}, email: {}, role: {}, - userGroup: { displayName: "User group" }, + userGroups: { displayName: "User groups" }, apps: {}, - settings: { displayName: "" }, + settings: { width: "50px", displayName: "", align: "Right" }, // access: {}, // group: {} } @@ -57,10 +56,25 @@ adminAccess: !!user.admin?.global, })) - let createUserModal - let basicOnboardingModal + $: enrichedUsers = $users.map(user => { + let userGroups = [] + $groups.forEach(group => { + if (group.users) { + group.users?.forEach(y => { + if (y._id === user._id) { + userGroups.push(group) + } + }) + } + }) + return { + ...user, + userGroups, + } + }) - function openBasicOnboardingModal() { + let createUserModal + let basicOnboardingModal = function openBasicOnboardingModal() { createUserModal.hide() basicOnboardingModal.show() } @@ -103,23 +117,21 @@ - - - diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js index 26e0f87041..3380fa9ca2 100644 --- a/packages/builder/src/stores/portal/groups.js +++ b/packages/builder/src/stores/portal/groups.js @@ -2,7 +2,14 @@ import { writable } from "svelte/store" import { API } from "api" export function createGroupsStore() { - const store = writable([]) + const DEFAULT_CONFIG = { + name: "", + icon: "", + color: "", + users: [], + } + + const store = writable([DEFAULT_CONFIG]) const actions = { init: async () => { From 0ee58bdea83083180e0111636b48e577036b6ee6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 24 Jun 2022 14:55:25 +0100 Subject: [PATCH 014/179] Add generic list and list item spectrum components for simple table style UI --- packages/bbui/src/Avatar/Avatar.svelte | 19 +++- packages/bbui/src/Form/Core/Picker.svelte | 8 +- .../bbui/src/List/Items/DetailSummary.svench | 53 ----------- packages/bbui/src/List/List.svelte | 28 ++++++ packages/bbui/src/List/ListItem.svelte | 92 +++++++++++++++++++ packages/bbui/src/index.js | 2 + 6 files changed, 142 insertions(+), 60 deletions(-) delete mode 100644 packages/bbui/src/List/Items/DetailSummary.svench create mode 100644 packages/bbui/src/List/List.svelte create mode 100644 packages/bbui/src/List/ListItem.svelte diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index f8acd9024c..136a4fe24b 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -4,7 +4,7 @@ ["XXS", "--spectrum-alias-avatar-size-50"], ["XS", "--spectrum-alias-avatar-size-75"], ["S", "--spectrum-alias-avatar-size-200"], - ["M", "--spectrum-alias-avatar-size-300"], + ["M", "--spectrum-alias-avatar-size-400"], ["L", "--spectrum-alias-avatar-size-500"], ["XL", "--spectrum-alias-avatar-size-600"], ["XXL", "--spectrum-alias-avatar-size-700"], @@ -13,6 +13,19 @@ export let url = "" export let disabled = false export let initials = "JD" + + const DefaultColor = "#3aab87" + + $: color = getColor(initials) + + const getColor = initials => { + if (!initials?.length) { + return DefaultColor + } + const code = initials[0].toLowerCase().charCodeAt(0) + const hue = ((code % 26) / 26) * 360 + return `hsl(${hue}, 50%, 50%)` + } {#if url} @@ -25,10 +38,11 @@ /> {:else}
{initials || ""}
@@ -40,7 +54,6 @@ display: grid; place-items: center; font-weight: 600; - background: #3aab87; border-radius: 50%; overflow: hidden; user-select: none; diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 92c99cd631..f7c2184cf3 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -91,7 +91,7 @@ {:else if fieldColour} - + {/if} - + {/if} {:else if getOptionColour(option, idx)} - + {/if} @@ -190,7 +190,7 @@ {#if getOptionIcon(option, idx) && getOptionColour(option, idx)} - + {/if} diff --git a/packages/bbui/src/List/Items/DetailSummary.svench b/packages/bbui/src/List/Items/DetailSummary.svench deleted file mode 100644 index 48fb8f7df8..0000000000 --- a/packages/bbui/src/List/Items/DetailSummary.svench +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -
- - 1 - 2 - 3 - 4 - - - 1 - 2 - 3 - 4 - -
- - - -
- - 1 - 2 - 3 - 4 - - - 1 - 2 - 3 - 4 - -
- diff --git a/packages/bbui/src/List/List.svelte b/packages/bbui/src/List/List.svelte new file mode 100644 index 0000000000..243b04da50 --- /dev/null +++ b/packages/bbui/src/List/List.svelte @@ -0,0 +1,28 @@ + + +
+ {#if title} +
+ {title} +
+ {/if} +
+ +
+
+ + diff --git a/packages/bbui/src/List/ListItem.svelte b/packages/bbui/src/List/ListItem.svelte new file mode 100644 index 0000000000..76a83e7b08 --- /dev/null +++ b/packages/bbui/src/List/ListItem.svelte @@ -0,0 +1,92 @@ + + +
+
+ {#if icon} +
+ +
+ {/if} + {#if avatar} + + {/if} + {#if title} + {title} + {/if} + {#if subtitle} + + {/if} +
+
+ +
+
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 97dc88030e..ea7dd88020 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -65,6 +65,8 @@ export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte" export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte" export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte" export { default as RichTextField } from "./Form/RichTextField.svelte" +export { default as List } from "./List/List.svelte" +export { default as ListItem } from "./List/ListItem.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" From 69a3c708a7a544db4e4268d42003d19ee2cdd57a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 24 Jun 2022 14:55:49 +0100 Subject: [PATCH 015/179] Add access tab to app overview --- .../src/pages/builder/portal/_layout.svelte | 2 + .../portal/manage/groups/[groupId].svelte | 2 +- .../overview/[application]/index.svelte | 4 ++ .../overview/_components/AccessTab.svelte | 51 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 5da8b34700..a3cc406fcc 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -14,6 +14,7 @@ } from "@budibase/bbui" import ConfigChecklist from "components/common/ConfigChecklist.svelte" import { organisation, auth } from "stores/portal" + import { roles } from "stores/backend" import { admin as adminStore } from "stores/portal" import { onMount } from "svelte" import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte" @@ -126,6 +127,7 @@ } else { try { await organisation.init() + await roles.fetch() } catch (error) { notifications.error("Error getting org config") } diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte index 21169c6513..833d89e9b5 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -139,7 +139,7 @@
- {#if group?.users.length} + {#if group?.users?.length} {#each group.users as user}
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte index 01d4095a3f..2709c490af 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -19,6 +19,7 @@ } from "@budibase/bbui" import OverviewTab from "../_components/OverviewTab.svelte" import SettingsTab from "../_components/SettingsTab.svelte" + import AccessTab from "../_components/AccessTab.svelte" import { API } from "api" import { store } from "builderStore" import { apps, auth } from "stores/portal" @@ -302,6 +303,9 @@ on:unpublish={e => unpublishApp(e.detail)} /> + + + {#if false}
Automation History contents
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte new file mode 100644 index 0000000000..ff3f1065fe --- /dev/null +++ b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte @@ -0,0 +1,51 @@ + + +
+ +
+ Access +
+ + Assign users to your app and define their access here + +
+
+ + + + + + + + + + + + + + + + + + + + +
+ + From bff5d9aa694dfd4ea91ff8957a2d911caf0d326e Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 24 Jun 2022 15:01:08 +0100 Subject: [PATCH 016/179] fix missing modal error --- .../src/pages/builder/portal/manage/users/index.svelte | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index c16a9a897f..c31cc778f0 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -10,6 +10,7 @@ Icon, notifications, } from "@budibase/bbui" + import AddUserModal from "./_components/AddUserModal.svelte" import BasicOnboardingModal from "./_components/BasicOnboardingModal.svelte" import { users, groups } from "stores/portal" import { onMount } from "svelte" @@ -17,6 +18,7 @@ import AppsTableRenderer from "./_components/AppsTableRenderer.svelte" import NameTableRenderer from "./_components/NameTableRenderer.svelte" import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" + import RoleTableRenderer from "./_components/RoleTableRenderer.svelte" const schema = { name: {}, @@ -132,6 +134,9 @@ + + + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte deleted file mode 100644 index adb725b703..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - -
-
- -
-
-
-
- {app.name} -
- {app.access} -
-
-
-
-
- - {app.access} -
- - diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte deleted file mode 100644 index f067260448..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte +++ /dev/null @@ -1,66 +0,0 @@ - - -
-
-
- -
-
-
-
-
- {user.email} -
- {user.access} -
-
-
-
-
- removeUser(user._id)} hoverable size="L" name="Close" /> -
- - diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 43680d0c2a..2a8c1b973f 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -43,7 +43,6 @@ onMount(async () => { try { await groups.actions.init() - console.log($groups) } catch (error) { notifications.error("Error getting User groups") } diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte index 885277a6eb..0f08496dee 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte @@ -1,7 +1,6 @@
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte index c80bead9f8..d212bb6f6a 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte @@ -1,14 +1,21 @@
- {#if value?.name} + {#if value}
- + x[0]) + .join("")} + />
- {value.name} + {value} {:else}
Invite pending...
{/if} @@ -17,6 +24,7 @@ diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index c31cc778f0..af3e745161 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -19,16 +19,20 @@ import NameTableRenderer from "./_components/NameTableRenderer.svelte" import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" import RoleTableRenderer from "./_components/RoleTableRenderer.svelte" + import { goto } from "@roxi/routify" const schema = { name: {}, email: {}, - role: {}, - userGroups: { displayName: "User groups" }, + role: { noPropagation: true, sortable: false }, + userGroups: { sortable: false, displayName: "User groups" }, apps: {}, - settings: { width: "50px", displayName: "", align: "Right" }, - // access: {}, - // group: {} + settings: { + sortable: false, + width: "50px", + displayName: "", + align: "Right", + }, } const accessTypes = [ @@ -71,6 +75,7 @@ }) return { ...user, + name: user.firstName ? user.firstName + " " + user.lastName : "", userGroups, } }) @@ -118,17 +123,19 @@
$goto(`./${detail._id}`)} {schema} data={enrichedUsers} allowEditColumns={false} allowEditRows={false} - allowSelectRows={false} + allowSelectRows={true} showHeaderBorder={false} customRenderers={[ { column: "userGroups", component: GroupsTableRenderer }, { column: "apps", component: AppsTableRenderer }, { column: "name", component: NameTableRenderer }, { column: "settings", component: SettingsTableRenderer }, + { column: "role", component: RoleTableRenderer }, ]} /> From 45fc55278e90433a281035f33b6d3e745f808e4d Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 29 Jun 2022 19:03:32 +0100 Subject: [PATCH 018/179] add InputPicker component and finish onboarding flow --- .../bbui/src/Form/Core/InputDropdown.svelte | 215 +++++++++++ .../bbui/src/Form/Core/Multiselect.svelte | 2 + packages/bbui/src/Form/InputDropdown.svelte | 55 +++ packages/bbui/src/Form/Multiselect.svelte | 3 +- packages/bbui/src/Table/Table.svelte | 4 +- packages/bbui/src/index.js | 2 + .../settings/UserGroupPicker.svelte | 73 ++++ .../builder/portal/manage/_layout.svelte | 2 +- .../portal/manage/groups/[groupId].svelte | 82 +---- .../portal/manage/users/[userId].svelte | 338 +++++++++++------- .../users/_components/AddUserModal.svelte | 88 +++-- .../_components/AppsTableRenderer.svelte | 1 + .../users/_components/EmailSelect.svelte | 0 .../_components/GroupsTableRenderer.svelte | 1 + .../users/_components/ImportUsersModal.svelte | 52 +++ .../_components/NameTableRenderer.svelte | 1 + .../_components/OnboardingTypeModal.svelte | 107 ++++++ .../_components/PasswordCopyRenderer.svelte | 15 + .../users/_components/PasswordModal.svelte | 61 ++++ .../_components/RoleTableRenderer.svelte | 17 +- .../_components/SettingsTableRenderer.svelte | 5 +- .../builder/portal/manage/users/index.svelte | 61 +++- packages/frontend-core/src/constants.js | 24 ++ 23 files changed, 954 insertions(+), 255 deletions(-) create mode 100644 packages/bbui/src/Form/Core/InputDropdown.svelte create mode 100644 packages/bbui/src/Form/InputDropdown.svelte create mode 100644 packages/builder/src/components/settings/UserGroupPicker.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/EmailSelect.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/PasswordCopyRenderer.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/PasswordModal.svelte diff --git a/packages/bbui/src/Form/Core/InputDropdown.svelte b/packages/bbui/src/Form/Core/InputDropdown.svelte new file mode 100644 index 0000000000..c9ca70dff9 --- /dev/null +++ b/packages/bbui/src/Form/Core/InputDropdown.svelte @@ -0,0 +1,215 @@ + + +
+
+ +
+
+ + {#if open} +
(open = false)} + transition:fly|local={{ y: -20, duration: 200 }} + class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" + > +
    + {#each options as option, idx} +
  • onPick(getOptionValue(option, idx))} + > + + {getOptionLabel(option, idx)} + + +
    • + {/each} +
+
+ {/if} +
+
+ + diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte index 3eb1add267..9dd5a25a4f 100644 --- a/packages/bbui/src/Form/Core/Multiselect.svelte +++ b/packages/bbui/src/Form/Core/Multiselect.svelte @@ -13,6 +13,7 @@ export let readonly = false export let autocomplete = false export let sort = false + export let autoWidth = false const dispatch = createEventDispatcher() $: selectedLookupMap = getSelectedLookupMap(value) @@ -85,4 +86,5 @@ {getOptionValue} onSelectOption={toggleOption} {sort} + {autoWidth} /> diff --git a/packages/bbui/src/Form/InputDropdown.svelte b/packages/bbui/src/Form/InputDropdown.svelte new file mode 100644 index 0000000000..73516ea37c --- /dev/null +++ b/packages/bbui/src/Form/InputDropdown.svelte @@ -0,0 +1,55 @@ + + + + + diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte index 957dcccddf..7bcf22aa06 100644 --- a/packages/bbui/src/Form/Multiselect.svelte +++ b/packages/bbui/src/Form/Multiselect.svelte @@ -14,7 +14,7 @@ export let getOptionLabel = option => option export let getOptionValue = option => option export let sort = false - + export let autoWidth = false const dispatch = createEventDispatcher() const onChange = e => { value = e.detail @@ -33,6 +33,7 @@ {sort} {getOptionLabel} {getOptionValue} + {autoWidth} on:change={onChange} on:click /> diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 29d9772d33..b6dea0638b 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -445,7 +445,7 @@ width: 100%; border-radius: 0; display: grid; - overflow: auto; + overflow: visible; } /* Header */ @@ -513,7 +513,7 @@ z-index: 3; } .spectrum-Table-headCell .title { - overflow: hidden; + overflow: visible; text-overflow: ellipsis; } .spectrum-Table-headCell:hover .spectrum-Table-editIcon { diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index ea7dd88020..6a4373df92 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -23,6 +23,7 @@ export { default as Icon, directions } from "./Icon/Icon.svelte" export { default as Toggle } from "./Form/Toggle.svelte" export { default as RadioGroup } from "./Form/RadioGroup.svelte" export { default as Checkbox } from "./Form/Checkbox.svelte" +export { default as InputDropdown } from "./Form/InputDropdown.svelte" export { default as DetailSummary } from "./DetailSummary/DetailSummary.svelte" export { default as Popover } from "./Popover/Popover.svelte" export { default as ProgressBar } from "./ProgressBar/ProgressBar.svelte" @@ -71,6 +72,7 @@ export { default as ListItem } from "./List/ListItem.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" export { default as CodeRenderer } from "./Table/CodeRenderer.svelte" +export { default as InternalRenderer } from "./Table/InternalRenderer.svelte" // Typography export { default as Body } from "./Typography/Body.svelte" diff --git a/packages/builder/src/components/settings/UserGroupPicker.svelte b/packages/builder/src/components/settings/UserGroupPicker.svelte new file mode 100644 index 0000000000..8e67331b09 --- /dev/null +++ b/packages/builder/src/components/settings/UserGroupPicker.svelte @@ -0,0 +1,73 @@ + + +
+ +
+
+ {filtered.length} {title}{filtered.length === 1 ? "" : "s"} +
+
+ Add all +
+
+ +
+ {#each filtered as item} +
+
+ {item[key]} +
+ + {#if selected.includes(item._id)} +
+ +
+ {/if} +
+ {/each} +
+
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte index b6c2897730..a63195a214 100644 --- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte @@ -12,7 +12,7 @@ $: wide = $page.path.includes("email/:template") || - $page.path.includes("users") || + ($page.path.includes("users") && !$page.path.includes(":userId")) || ($page.path.includes("groups") && !$page.path.includes(":groupId")) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte index b3ee52ffcf..08610e0e23 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -8,14 +8,13 @@ Body, Icon, Popover, - Search, - Divider, - Detail, notifications, List, ListItem, StatusLight, } from "@budibase/bbui" + import UserGroupPicker from "components/settings/UserGroupPicker.svelte" + import { users, apps, groups } from "stores/portal" import { onMount } from "svelte" import { RoleUtils } from "@budibase/frontend-core" @@ -47,8 +46,9 @@ } async function selectUser(id) { - let selectedUser = selectedUsers.find(user_id => user_id === id) + let selectedUser = selectedUsers.includes(id) let enrichedUser = $users.find(user => user._id === id) + if (selectedUser) { selectedUsers = selectedUsers.filter(id => id !== selectedUser) let newUsers = group.users.filter(user => user._id !== id) @@ -57,6 +57,7 @@ selectedUsers = [...selectedUsers, id] group.users.push(enrichedUser) } + await groups.actions.save(group) } @@ -97,55 +98,24 @@ -
- -
-
- {filteredUsers.length} User{filteredUsers.length === 1 - ? "" - : "s"} -
-
- Add all -
-
- -
- {#each filteredUsers as user} -
-
- {user.email} -
- - {#if selectedUsers.includes(user._id)} -
- -
- {/if} -
- {/each} -
-
+ {#if group?.users.length} {#each group.users as user} - removeUser(user._id)} + on:click={() => removeUser(user?._id)} hoverable size="L" name="Close" @@ -180,7 +150,7 @@ {/each} {:else} - + {/if} @@ -190,24 +160,6 @@ margin-left: var(--spacing-l); } - .users-header { - align-items: center; - padding: var(--spacing-m) 0 var(--spacing-m) 0; - display: flex; - justify-content: space-between; - } - - .user-selection { - align-items: end; - display: flex; - justify-content: space-between; - cursor: pointer; - } - - .user-selection > :first-child { - padding-top: var(--spacing-m); - } - .header { display: flex; justify-content: space-between; diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index a8cb340465..f095cf8a90 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -2,43 +2,44 @@ import { goto } from "@roxi/routify" import { ActionButton, + ActionMenu, + Avatar, Button, Layout, Heading, Body, - Divider, Label, + List, + ListItem, + Icon, Input, + MenuItem, + Popover, Select, - Toggle, Modal, - Table, ModalContent, notifications, + StatusLight, } from "@budibase/bbui" + import { onMount } from "svelte" + import { fetchData } from "helpers" - import { users, auth } from "stores/portal" + import { users, auth, groups } from "stores/portal" + import { Constants } from "@budibase/frontend-core" - import TagsRenderer from "./_components/RolesTagsTableRenderer.svelte" - - import UpdateRolesModal from "./_components/UpdateRolesModal.svelte" import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" + import { RoleUtils } from "@budibase/frontend-core" + import UserGroupPicker from "components/settings/UserGroupPicker.svelte" export let userId let deleteUserModal - let editRolesModal let resetPasswordModal - - const roleSchema = { - name: { displayName: "App" }, - role: {}, - } - - const noRoleSchema = { - name: { displayName: "App" }, - } - + let popoverAnchor + let searchTerm = "" + let popover + let selectedGroups = [] $: defaultRoleId = $userFetch?.data?.builder?.global ? "ADMIN" : "" + // Merge the Apps list and the roles response to get something that makes sense for the table $: allAppList = Object.keys($apps?.data).map(id => { const roleId = $userFetch?.data?.roles?.[id] || defaultRoleId @@ -50,19 +51,23 @@ } }) - $: appList = allAppList.filter(app => !!app.role[0]) - $: noRoleAppList = allAppList - .filter(app => !app.role[0]) - .map(app => { - delete app.role - return app - }) + // Used for searching through groups in the add group popover + $: filteredGroups = $groups.filter( + group => + selectedGroups && + group?.name?.toLowerCase().includes(searchTerm.toLowerCase()) + ) - let selectedApp + $: appList = allAppList.filter(app => !!app.role[0]) + + $: userGroups = $groups.filter(x => { + return x.users?.some(y => { + return y._id === userId + }) + }) const userFetch = fetchData(`/api/global/users/${userId}`) const apps = fetchData(`/api/global/roles`) - async function deleteUser() { try { await users.delete(userId) @@ -73,8 +78,17 @@ } } - let toggleDisabled = false - + function getHighestRole(roles) { + let highestRole + let highestRoleNumber = 0 + roles.forEach(role => { + let roleNumber = RoleUtils.getRolePriority(role._id) + if (roleNumber > highestRoleNumber) { + highestRole = role + } + }) + return highestRole + } async function updateUserFirstName(evt) { try { await users.save({ ...$userFetch?.data, firstName: evt.target.value }) @@ -84,6 +98,13 @@ } } + async function removeGroup(id) { + let updatedGroup = $groups.find(x => x._id === id) + let newUsers = updatedGroup.users.filter(user => user._id !== userId) + updatedGroup.users = newUsers + groups.actions.save(updatedGroup) + } + async function updateUserLastName(evt) { try { await users.save({ ...$userFetch?.data, lastName: evt.target.value }) @@ -93,6 +114,30 @@ } } + async function updateUserRole() { + return + } + + async function addGroup(groupId) { + let selectedGroup = selectedGroups.includes(groupId) + let newUser = $users.find(user => user._id === userId) + let group = $groups.find(group => group._id === groupId) + + if (selectedGroup) { + selectedGroups = selectedGroups.filter(id => id === selectedGroup) + let newUsers = group.users.filter(user => user._id !== newUser._id) + group.users = newUsers + } else { + selectedGroups = [...selectedGroups, groupId] + group.users.push(newUser) + } + + await groups.actions.save(group) + } + + function addAll() {} + + /* async function toggleFlag(flagName, detail) { toggleDisabled = true try { @@ -104,6 +149,7 @@ toggleDisabled = false } + async function toggleBuilderAccess({ detail }) { return toggleFlag("builder", detail) } @@ -116,38 +162,56 @@ selectedApp = detail editRolesModal.show() } +*/ + onMount(async () => { + try { + await groups.actions.init() + } catch (error) { + notifications.error("Error getting User groups") + } + }) - +
- $goto("./")} - quiet - size="S" - icon="BackAndroid" - > - Back to users + $goto("./")} size="S" icon="ArrowLeft"> + Back
- User: {$userFetch?.data?.email} - - Change user settings and update their app roles. Also contains the ability - to delete the user as well as force reset their password. - - + +
+
+
+ +
+ {$userFetch?.data?.firstName + + " " + + $userFetch?.data?.lastName} + {$userFetch?.data?.email} +
+
+
+
+ + + + + Force Password Reset + Delete + +
+
+ - General
-
- - -
-
- - {#if userId !== $auth.user._id}
- - -
-
- - + +
- - - No Access - Apps do not appear in the users portal. Public pages may still be viewed - if visited directly. -
- - + + - Delete user - Deleting a user completely removes them from your account. +
+
+ User groups + Manage apps that this User group has been assigned to +
+
+ +
+ + + +
+ + + {#if userGroups.length} + {#each userGroups as group} + + {/each} + {:else} + + {/if} + + + + + +
+ Apps +
+ Manage apps that this User group has been assigned to +
+
+ + + {#if appList.length} + {#each appList as app} + +
+ +
+ {getHighestRole(app.role).name} +
+
+ + {/each} + {:else} + + {/if} + -
- -
@@ -248,13 +332,6 @@ - - - diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte index 0255784a7b..3ff1b3df0c 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte @@ -1,82 +1,78 @@ - - If you have SMTP configured and an email for the new user, you can use the - automated email onboarding flow. Otherwise, use our basic onboarding process - with autogenerated passwords. - - -
-
- - + + + + {#each userData as input, index} + + {/each} +
+ Add email
-
- - -
-
+ + + option.name} + getOptionValue={option => option.name} + /> diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte index 5611b20e99..b4f9edd590 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte @@ -21,6 +21,7 @@ diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte index d212bb6f6a..255e63a611 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte @@ -25,6 +25,7 @@ .align { display: flex; align-items: center; + overflow: hidden; } .spacing { diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte new file mode 100644 index 0000000000..089721348e --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte @@ -0,0 +1,107 @@ + + + showConfirmationModal(selectedOnboardingType)} + disabled={!selectedOnboardingType} +> + +
{ + selectedOnboardingType = emailOnboardingKey + }} + > +
+ +
+ Send email invites +
+
+
+ {#if selectedOnboardingType == emailOnboardingKey} +
+ +
+ {/if} +
+
+ +
{ + selectedOnboardingType = basicOnboaridngKey + }} + > +
+ +
+ Generate passwords for each user +
+
+
+ {#if selectedOnboardingType == basicOnboaridngKey} +
+ +
+ {/if} +
+
+ + + + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordCopyRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordCopyRenderer.svelte new file mode 100644 index 0000000000..00e0c6eeab --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordCopyRenderer.svelte @@ -0,0 +1,15 @@ + + +
+ {value} +
+ +
+
+ + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordModal.svelte new file mode 100644 index 0000000000..26738f34c8 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/PasswordModal.svelte @@ -0,0 +1,61 @@ + + + + All your new users can be accessed through the autogenerated passwords. + Make not of these passwords or download the csv + +
+
+ + +
+ Passwords CSV +
+
+
+ +
+ + + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte index f25501f90b..5182614789 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte @@ -8,19 +8,16 @@ ] -
-
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte index 0ead895893..37ce58a0b7 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte @@ -2,7 +2,10 @@ import { Icon, ActionMenu, MenuItem } from "@budibase/bbui" -
+
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index af3e745161..6fd674f605 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -7,6 +7,7 @@ Table, Layout, Modal, + ModalContent, Icon, notifications, } from "@budibase/bbui" @@ -20,11 +21,17 @@ import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" import RoleTableRenderer from "./_components/RoleTableRenderer.svelte" import { goto } from "@roxi/routify" + import OnboardingTypeModal from "./_components/OnboardingTypeModal.svelte" + import PasswordModal from "./_components/PasswordModal.svelte" + import ImportUsersModal from "./_components/ImportUsersModal.svelte" const schema = { name: {}, email: {}, - role: { noPropagation: true, sortable: false }, + role: { + noPropagation: true, + sortable: false, + }, userGroups: { sortable: false, displayName: "User groups" }, apps: {}, settings: { @@ -52,6 +59,12 @@ let search let email + let createUserModal, + basicOnboardingModal, + inviteConfirmationModal, + onboardingTypeModal, + passwordModal, + importUsersModal $: filteredUsers = $users .filter(user => user.email.includes(search || "")) @@ -80,10 +93,16 @@ } }) - let createUserModal - let basicOnboardingModal = function openBasicOnboardingModal() { - createUserModal.hide() - basicOnboardingModal.show() + function showOnboardingTypeModal() { + onboardingTypeModal.show() + } + + function showConfirmationModal(onboardingType) { + if (onboardingType === "emailOnboarding") { + inviteConfirmationModal.show() + } else { + passwordModal.show() + } } onMount(async () => { @@ -120,7 +139,9 @@ icon="UserAdd" cta>Add Users - +
$goto(`./${detail._id}`)} @@ -142,8 +163,34 @@ - + + + + + Your users should now recieve an email invite to get access to their + Budibase account + + + + + + + + + + + + + + diff --git a/packages/bbui/src/Form/PickerDropdown.svelte b/packages/bbui/src/Form/PickerDropdown.svelte new file mode 100644 index 0000000000..de284dd379 --- /dev/null +++ b/packages/bbui/src/Form/PickerDropdown.svelte @@ -0,0 +1,129 @@ + + + + + From 3de2123dc4fbb113db63d95150e078164543a6ef Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 5 Jul 2022 09:21:59 +0100 Subject: [PATCH 020/179] group / user app assignment --- .../bbui/src/Form/Core/InputDropdown.svelte | 3 + packages/bbui/src/Form/Core/Select.svelte | 1 - .../bbui/src/IconPicker/IconPicker.svelte | 4 +- packages/bbui/src/index.js | 1 + .../portal/manage/groups/[groupId].svelte | 22 ++-- .../groups/_components/UserGroupsRow.svelte | 2 +- .../builder/portal/manage/groups/index.svelte | 17 +-- .../portal/manage/users/[userId].svelte | 76 +++++++----- .../users/_components/AddUserModal.svelte | 33 +++-- .../users/_components/ImportUsersModal.svelte | 96 ++++++++++++++- .../_components/OnboardingTypeModal.svelte | 5 +- .../users/_components/PasswordModal.svelte | 4 +- .../builder/portal/manage/users/index.svelte | 58 ++++++++- .../overview/_components/AccessTab.svelte | 116 +++++++++++++++--- .../_components/AssignmentModal.svelte | 63 ++++++++++ packages/builder/src/stores/portal/apps.js | 1 + packages/builder/src/stores/portal/groups.js | 1 + packages/builder/src/stores/portal/users.js | 28 +++-- packages/frontend-core/src/api/user.js | 19 +++ .../src/api/controllers/global/users.ts | 29 +++++ .../worker/src/api/routes/global/groups.js | 3 +- .../worker/src/api/routes/global/users.js | 21 ++++ packages/worker/src/utilities/email.js | 17 ++- 23 files changed, 501 insertions(+), 119 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/overview/_components/AssignmentModal.svelte diff --git a/packages/bbui/src/Form/Core/InputDropdown.svelte b/packages/bbui/src/Form/Core/InputDropdown.svelte index c9ca70dff9..be43676bb9 100644 --- a/packages/bbui/src/Form/Core/InputDropdown.svelte +++ b/packages/bbui/src/Form/Core/InputDropdown.svelte @@ -5,6 +5,7 @@ import { fly } from "svelte/transition" import { createEventDispatcher } from "svelte" import clickOutside from "../../Actions/click_outside" + import StatusLight from "../../StatusLight/StatusLight.svelte" export let inputValue export let dropdownValue @@ -18,6 +19,8 @@ export let options = [] export let getOptionLabel = option => extractProperty(option, "label") export let getOptionValue = option => extractProperty(option, "value") + export let getOptionColour = option => extractProperty(option, "colour") + export let isOptionSelected = () => false const dispatch = createEventDispatcher() diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index 81d7ec8e6c..f549f58d0c 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -17,7 +17,6 @@ export let autoWidth = false export let autocomplete = false export let sort = false - const dispatch = createEventDispatcher() let open = false $: fieldText = getFieldText(value, options, placeholder) diff --git a/packages/bbui/src/IconPicker/IconPicker.svelte b/packages/bbui/src/IconPicker/IconPicker.svelte index 0b96cbe4c9..0e71be2c33 100644 --- a/packages/bbui/src/IconPicker/IconPicker.svelte +++ b/packages/bbui/src/IconPicker/IconPicker.svelte @@ -6,7 +6,7 @@ import Icon from "../Icon/Icon.svelte" import { createEventDispatcher } from "svelte" - export let value = "Anchor" + export let value export let size = "M" export let alignRight = false @@ -59,7 +59,7 @@ style={value ? `background: ${value};` : ""} class:placeholder={!value} > - + {#if open} diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 6a4373df92..21af5a16db 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -24,6 +24,7 @@ export { default as Toggle } from "./Form/Toggle.svelte" export { default as RadioGroup } from "./Form/RadioGroup.svelte" export { default as Checkbox } from "./Form/Checkbox.svelte" export { default as InputDropdown } from "./Form/InputDropdown.svelte" +export { default as PickerDropdown } from "./Form/PickerDropdown.svelte" export { default as DetailSummary } from "./DetailSummary/DetailSummary.svelte" export { default as Popover } from "./Popover/Popover.svelte" export { default as ProgressBar } from "./ProgressBar/ProgressBar.svelte" diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte index 08610e0e23..9c6cd6241f 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -22,23 +22,15 @@ export let groupId let popoverAnchor let popover - $: group = $groups.find(x => x._id === groupId) let searchTerm = "" let selectedUsers = [] + $: group = $groups.find(x => x._id === groupId) $: filteredUsers = $users.filter( user => selectedUsers && user?.email?.toLowerCase().includes(searchTerm.toLowerCase()) ) - let app_list = [ - { - access: "ADMIN", - name: "test app", - icon: "Anchor", - color: "blue", - }, - ] - + $: console.log(group) async function addAll() { selectedUsers = [...selectedUsers, ...filteredUsers] group.users = selectedUsers @@ -138,9 +130,13 @@ - {#if app_list.length} - {#each app_list as app} - + {#if group?.apps} + {#each group.apps as app} +
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte index 5988601a2a..478608f2d4 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -45,7 +45,7 @@
- {parseInt(group.appCount) || 0} app{parseInt(group.appCount) === 1 + {parseInt(group?.apps?.length) || 0} app{parseInt(group?.apps?.length) === 1 ? "" : "s"}
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 2a8c1b973f..6841be9e61 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -21,6 +21,7 @@ icon: "", color: "", users: [], + apps: [], } let proPlan = true @@ -82,13 +83,15 @@ {/if}
-
- {#each $groups as group} -
- -
- {/each} -
+ {#if proPlan} +
+ {#each $groups as group} +
+ +
+ {/each} +
+ {/if} diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index f095cf8a90..690ac71409 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -24,7 +24,8 @@ import { onMount } from "svelte" import { fetchData } from "helpers" - import { users, auth, groups } from "stores/portal" + import { users, auth, groups, apps } from "stores/portal" + import { roles } from "stores/backend" import { Constants } from "@budibase/frontend-core" import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" @@ -38,19 +39,28 @@ let searchTerm = "" let popover let selectedGroups = [] - $: defaultRoleId = $userFetch?.data?.builder?.global ? "ADMIN" : "" - - // Merge the Apps list and the roles response to get something that makes sense for the table - $: allAppList = Object.keys($apps?.data).map(id => { - const roleId = $userFetch?.data?.roles?.[id] || defaultRoleId - const role = $apps?.data?.[id].roles.find(role => role._id === roleId) - return { - ...$apps?.data?.[id], - _id: id, - role: [role], - } - }) + let allAppList = [] + $: console.log($apps) + $: console.log($userFetch.data) + $: allAppList = $apps + .filter(x => { + if ($userFetch.data?.roles) { + return Object.keys($userFetch.data.roles).find(y => { + return x.appId === y + }) + } + }) + .map(app => { + let roles = Object.keys($userFetch.data.roles).filter(id => { + return id === app.appId + }) + return { + ...app, + roles, + } + }) + $: console.log(allAppList) // Used for searching through groups in the add group popover $: filteredGroups = $groups.filter( group => @@ -58,16 +68,13 @@ group?.name?.toLowerCase().includes(searchTerm.toLowerCase()) ) - $: appList = allAppList.filter(app => !!app.role[0]) - $: userGroups = $groups.filter(x => { - return x.users?.some(y => { + return x.users?.find(y => { return y._id === userId }) }) const userFetch = fetchData(`/api/global/users/${userId}`) - const apps = fetchData(`/api/global/roles`) async function deleteUser() { try { await users.delete(userId) @@ -166,6 +173,7 @@ onMount(async () => { try { await groups.actions.init() + await apps.load() } catch (error) { notifications.error("Error getting User groups") } @@ -243,9 +251,7 @@
User groups - Manage apps that this User group has been assigned to + Add or remove this user from user groups
- {#if appList.length} - {#each appList as app} - -
- -
- {getHighestRole(app.role).name} + {#if allAppList.length} + {#each allAppList as app} +
+ +
+ +
+ d +
-
- + +
{/each} {:else} diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte index 3ff1b3df0c..a475ea01c1 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte @@ -5,39 +5,33 @@ Label, ModalContent, Multiselect, - notifications, InputDropdown, } from "@budibase/bbui" - import { users, groups } from "stores/portal" - import analytics, { Events } from "analytics" + import { createEventDispatcher } from "svelte" + import { groups } from "stores/portal" import { Constants } from "@budibase/frontend-core" export let disabled export let showOnboardingTypeModal - const options = ["Email onboarding", "Basic onboarding"] - let selected = options[0] - let builder, admin - $: userData = [{ email: "", role: "", error: null }] + const dispatch = createEventDispatcher() + + $: userData = [{ email: "", role: "", groups: [], error: null }] - /* - async function createUserFlow() { - try { - const res = await users.invite({ email: "", builder, admin }) - notifications.success(res.message) - analytics.captureEvent(Events.USER.INVITE, { type: selected }) - } catch (error) { - notifications.error("Error inviting user") - } - } - */ function addNewInput() { userData = [...userData, { email: "", role: "" }] } + + function setValue(e) { + userData.groups = e.detail + } { + showOnboardingTypeModal() + dispatch("change", userData) + }} size="M" title="Add new user" confirmText="Add user" @@ -64,6 +58,7 @@ setValue(e)} label="User Groups" options={$groups} getOptionLabel={option => option.name} diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte index 24db91500d..b9b4f91af8 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte @@ -1,8 +1,44 @@ Import your users email addrresses from a CSV -
-
- Upload -
+
+ +
@@ -49,4 +88,51 @@ justify-content: center; align-items: center; } + + .error { + color: var(--red); + } + + .dropzone { + text-align: center; + display: flex; + align-items: center; + flex-direction: column; + border-radius: 10px; + transition: all 0.3s; + } + .uploaded { + color: var(--blue); + } + + label { + font-family: var(--font-sans); + cursor: pointer; + font-weight: 600; + box-sizing: border-box; + overflow: hidden; + border-radius: var(--border-radius-s); + color: var(--ink); + padding: var(--spacing-m) var(--spacing-l); + transition: all 0.2s ease 0s; + display: inline-flex; + text-rendering: optimizeLegibility; + min-width: auto; + outline: none; + font-feature-settings: "case" 1, "rlig" 1, "calt" 0; + -webkit-box-align: center; + user-select: none; + flex-shrink: 0; + align-items: center; + justify-content: center; + width: 100%; + background-color: var(--grey-2); + font-size: var(--font-size-xs); + line-height: normal; + border: var(--border-transparent); + } + + input[type="file"] { + display: none; + } diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte index 089721348e..7ec6d338d5 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/OnboardingTypeModal.svelte @@ -1,6 +1,7 @@
@@ -11,31 +80,44 @@ Assign users to your app and define their access here - +
- - - - - - + {#each appGroups as group} + + + + {/each} - - - - - - - - - + {#each appUsers as user} + + extractAppId(x) === extractAppId(app.appId) + ) + ]} + /> + + {/each}
+ + + + diff --git a/packages/bbui/src/Form/PickerDropdown.svelte b/packages/bbui/src/Form/PickerDropdown.svelte index eec5b2823b..4ffb8248d0 100644 --- a/packages/bbui/src/Form/PickerDropdown.svelte +++ b/packages/bbui/src/Form/PickerDropdown.svelte @@ -71,9 +71,9 @@ } const onPickPrimary = e => { - primaryLabel = e.detail.label - primaryValue = e.detail.value - dispatch("pickprimary", e.detail.value) + primaryLabel = e?.detail?.label || null + primaryValue = e?.detail?.value || null + dispatch("pickprimary", e?.detail?.value || {}) } const onPickSecondary = e => { diff --git a/packages/builder/src/pages/builder/portal/apps/_components/AcessFilter.svelte b/packages/builder/src/pages/builder/portal/apps/_components/AcessFilter.svelte new file mode 100644 index 0000000000..d0662e7b41 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/_components/AcessFilter.svelte @@ -0,0 +1,43 @@ + + + diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index de5ad178cb..7eee36f2b6 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -20,12 +20,13 @@ import { store, automationStore } from "builderStore" import { API } from "api" import { onMount } from "svelte" - import { apps, auth, admin, templates } from "stores/portal" + import { apps, auth, admin, templates, groups } from "stores/portal" import download from "downloadjs" import { goto } from "@roxi/routify" import AppRow from "components/start/AppRow.svelte" import { AppStatus } from "constants" import Logo from "assets/bb-space-man.svg" + import AccessFilter from "./_components/AcessFilter.svelte" let sortBy = "name" let template @@ -39,6 +40,7 @@ let cloud = $admin.cloud let creatingFromTemplate = false let automationErrors + let accessFilterList = null const resolveWelcomeMessage = (auth, apps) => { const userWelcome = auth?.user?.firstName @@ -56,8 +58,10 @@ : "Start from scratch" $: enrichedApps = enrichApps($apps, $auth.user, sortBy) - $: filteredApps = enrichedApps.filter(app => - app?.name?.toLowerCase().includes(searchTerm.toLowerCase()) + $: filteredApps = enrichedApps.filter( + app => + app?.name?.toLowerCase().includes(searchTerm.toLowerCase()) && + (accessFilterList !== null ? accessFilterList.includes(app?.appId) : true) ) $: lockedApps = filteredApps.filter(app => app?.lockedYou || app?.lockedOther) @@ -202,6 +206,10 @@ $goto(`../../app/${app.devId}`) } + const accessFilterAction = accessFilter => { + accessFilterList = accessFilter.detail + } + function createAppFromTemplateUrl(templateKey) { // validate the template key just to make sure const templateParts = templateKey.split("/") @@ -347,6 +355,9 @@ {/if}
+ {#if $groups.length} + + {/if}
- + diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index f628a451c5..60738f94c8 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -37,28 +37,35 @@ export function createUsersStore() { }) } - async function create({ - email, - password, - admin, - builder, - forceResetPassword, - }) { - const body = { - email, - password, - roles: {}, - } - if (forceResetPassword) { - body.forceResetPassword = forceResetPassword - } - if (builder) { - body.builder = { global: true } - } - if (admin) { - body.admin = { global: true } - } - await API.saveUser(body) + async function create(data) { + let mappedUsers = data.users.map(user => { + console.log(user) + const body = { + email: user.email, + password: user.password, + roles: {}, + } + if (user.forceResetPassword) { + body.forceResetPassword = user.forceResetPassword + } + + switch (user.role) { + case "appUser": + body.builder = { global: false } + body.admin = { global: false } + break + case "developer": + body.builder = { global: true } + break + case "admin": + body.admin = { global: true } + break + } + + return body + }) + await API.saveUsers({ users: mappedUsers, groups: data.groups }) + // re-search from first page await search() } diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js index a78697aaa6..b00ddfdf51 100644 --- a/packages/frontend-core/src/api/user.js +++ b/packages/frontend-core/src/api/user.js @@ -83,6 +83,20 @@ export const buildUserEndpoints = API => ({ }) }, + /** + * Creates multiple users. + * @param users the array of user objects to create + */ + saveUsers: async ({ users, groups }) => { + return await API.post({ + url: "/api/global/users/bulkSave", + body: { + users, + groups, + }, + }) + }, + /** * Deletes a user from the curernt tenant. * @param userId the ID of the user to delete diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index ce6eeda7c7..bfc3039ac8 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -166,13 +166,19 @@ export async function preview(ctx: any) { } } -async function execute(ctx: any, opts = { rowsOnly: false }) { +async function execute( + ctx: any, + opts = { rowsOnly: false, isAutomation: false } +) { const db = getAppDB() const query = await db.get(ctx.params.queryId) const datasource = await db.get(query.datasourceId) - const authConfigCtx: any = getAuthConfig(ctx) + let authConfigCtx: any = {} + if (!opts.isAutomation) { + authConfigCtx = getAuthConfig(ctx) + } const enrichedParameters = ctx.request.body.parameters || {} // make sure parameters are fully enriched with defaults @@ -214,11 +220,11 @@ async function execute(ctx: any, opts = { rowsOnly: false }) { } export async function executeV1(ctx: any) { - return execute(ctx, { rowsOnly: true }) + return execute(ctx, { rowsOnly: true, isAutomation: false }) } -export async function executeV2(ctx: any) { - return execute(ctx, { rowsOnly: false }) +export async function executeV2(ctx: any, isAutomation?: any) { + return execute(ctx, { rowsOnly: false, isAutomation: isAutomation }) } const removeDynamicVariables = async (queryId: any) => { diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index 156df504e9..a0c664b7df 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -72,14 +72,18 @@ exports.run = async function ({ inputs, appId, emitter }) { }) try { - await queryController.executeV2(ctx) + await queryController.executeV2(ctx, true) + const { data, ...rest } = ctx.body + console.log(data) + return { response: data, info: rest, success: true, } } catch (err) { + console.log(err) return { success: false, info: {}, diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index d355ed9aed..82a6b2dd8e 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -22,6 +22,48 @@ export const save = async (ctx: any) => { } } +export const bulkSave = async (ctx: any) => { + let { users: newUsers, groups } = ctx.request.body + let usersToSave: any[] = [] + let groupsToSave: any[] = [] + const db = tenancy.getGlobalDB() + + newUsers.forEach((user: any) => { + usersToSave.push( + users.save(user, { + hashPassword: false, + requirePassword: user.requirePassword, + bulkCreate: true, + }) + ) + + if (groups.length) { + groups.forEach(async (groupId: string) => { + let oldGroup = await db.get(groupId) + groupsToSave.push(oldGroup) + }) + } + }) + try { + const allUsers = await Promise.all(usersToSave) + let response = await db.bulkDocs(allUsers) + + // delete passwords and add to group + allUsers.forEach(user => { + delete user.password + }) + + groupsToSave.forEach(async group => { + group.users = [...group.users, ...allUsers] + await db.put(group) + }) + + ctx.body = response + } catch (err: any) { + ctx.throw(err.status || 400, err) + } +} + const parseBooleanParam = (param: any) => { return !(param && param === "false") } diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js index bac17ac01e..45d64b04e8 100644 --- a/packages/worker/src/api/routes/global/users.js +++ b/packages/worker/src/api/routes/global/users.js @@ -53,6 +53,13 @@ router users.buildUserSaveValidation(), controller.save ) + .post( + "/api/global/users/bulkSave", + adminOnly, + users.buildUserBulkSaveValidation(), + controller.bulkSave + ) + .get("/api/global/users", builderOrAdmin, controller.fetch) .post("/api/global/users/search", builderOrAdmin, controller.search) .delete("/api/global/users/:id", adminOnly, controller.destroy) diff --git a/packages/worker/src/api/routes/validation/users.ts b/packages/worker/src/api/routes/validation/users.ts index 81372358ff..e7ad4cca18 100644 --- a/packages/worker/src/api/routes/validation/users.ts +++ b/packages/worker/src/api/routes/validation/users.ts @@ -1,22 +1,23 @@ import joiValidator from "../../../middleware/joi-validator" import Joi from "joi" +let schema: any = { + email: Joi.string().allow(null, ""), + password: Joi.string().allow(null, ""), + forceResetPassword: Joi.boolean().optional(), + firstName: Joi.string().allow(null, ""), + lastName: Joi.string().allow(null, ""), + builder: Joi.object({ + global: Joi.boolean().optional(), + apps: Joi.array().optional(), + }) + .unknown(true) + .optional(), + // maps appId -> roleId for the user + roles: Joi.object().pattern(/.*/, Joi.string()).required().unknown(true), +} + export const buildUserSaveValidation = (isSelf = false) => { - let schema: any = { - email: Joi.string().allow(null, ""), - password: Joi.string().allow(null, ""), - forceResetPassword: Joi.boolean().optional(), - firstName: Joi.string().allow(null, ""), - lastName: Joi.string().allow(null, ""), - builder: Joi.object({ - global: Joi.boolean().optional(), - apps: Joi.array().optional(), - }) - .unknown(true) - .optional(), - // maps appId -> roleId for the user - roles: Joi.object().pattern(/.*/, Joi.string()).required().unknown(true), - } if (!isSelf) { schema = { ...schema, @@ -26,3 +27,19 @@ export const buildUserSaveValidation = (isSelf = false) => { } return joiValidator.body(Joi.object(schema).required().unknown(true)) } + +export const buildUserBulkSaveValidation = (isSelf = false) => { + if (!isSelf) { + schema = { + ...schema, + _id: Joi.string(), + _rev: Joi.string(), + } + } + let bulkSaveSchema = { + groups: Joi.array().optional(), + users: Joi.array().items(Joi.object(schema).required().unknown(true)), + } + + return joiValidator.body(Joi.object(bulkSaveSchema).required().unknown(true)) +} From 6758574e7f77318d16ac0de6d16586cb66fe3df2 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Mon, 11 Jul 2022 18:03:41 +0100 Subject: [PATCH 030/179] creating users from csv --- .../users/_components/ImportUsersModal.svelte | 42 +++++++++++++++---- .../builder/portal/manage/users/index.svelte | 21 +++++++++- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte index 5c78dedd66..7ff60530c6 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte @@ -7,20 +7,38 @@ notifications, } from "@budibase/bbui" import { groups } from "stores/portal" + import { emailValidator } from "../../../../../../helpers/validation" import { Constants } from "@budibase/frontend-core" const BYTES_IN_MB = 1000000 const FILE_SIZE_LIMIT = BYTES_IN_MB * 5 - export let showOnboardingTypeModal + export let createUsersFromCsv + let files = [] - let csvString = undefined + let userEmails = [] + let userGroups = [] + let usersRole = null + $: invalidEmails = [] + + const validEmails = userEmails => { + for (const email of userEmails) { + if (emailValidator(email) !== true) invalidEmails.push(email) + } + + if (!invalidEmails.length) return true + + notifications.error( + `Error, please check the following email${ + invalidEmails.length > 1 ? "s" : "" + }: ${invalidEmails.join(", ")}` + ) + + return false + } - /* - function parseCsv() {} -*/ async function handleFile(evt) { const fileArray = Array.from(evt.target.files) if (fileArray.some(file => file.size >= FILE_SIZE_LIMIT)) { @@ -37,6 +55,8 @@ reader.addEventListener("load", function (e) { csvString = e.target.result files = fileArray + + userEmails = csvString.split("\n") }) reader.readAsText(fileArray[0]) } @@ -49,8 +69,8 @@ showCancelButton={false} cancelText="Cancel" showCloseIcon={false} - onConfirm={showOnboardingTypeModal} - disabled={!files.length} + onConfirm={() => createUsersFromCsv({ userEmails, usersRole, userGroups })} + disabled={!userEmails.length || !validEmails(userEmails) || !usersRole} > Import your users email addrresses from a CSV @@ -61,14 +81,18 @@ - + option.name} - getOptionValue={option => option.name} + getOptionValue={option => option._id} /> diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 77ecc76d22..e6c90ed46d 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -117,6 +117,25 @@ } } + const createUsersFromCsv = async userCsvData => { + const { userEmails, usersRole, userGroups } = userCsvData + + const users = [] + for (const email of userEmails) { + const newUser = { + email: email, + role: usersRole, + password: Math.random().toString(36).substring(2, 22), + forceResetPassword: true, + } + + users.push(newUser) + } + + userData = { groups: userGroups, users: users } + return createUser() + } + async function createUser() { try { await users.create(userData) @@ -258,7 +277,7 @@ - + From fbffe43c97a1788b9e1b7afcacc102aa3ca0362c Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 14 Jul 2022 11:18:31 +0100 Subject: [PATCH 038/179] wrong link for groups button --- .../src/pages/builder/portal/manage/groups/index.svelte | 4 +++- packages/server/src/middleware/authorized.ts | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 4508e1bd4a..49c3140e00 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -72,7 +72,9 @@ newStyles icon={isProPlan ? "UserGroup" : ""} cta={isProPlan} - on:click={() => modal.show()} + on:click={isProPlan + ? () => modal.show() + : window.open("https://budibase.com/pricing/", "_blank")} >{isProPlan ? "Create user group" : "Upgrade Account"} {#if !isProPlan} diff --git a/packages/server/src/middleware/authorized.ts b/packages/server/src/middleware/authorized.ts index a94c50595b..298a50988a 100644 --- a/packages/server/src/middleware/authorized.ts +++ b/packages/server/src/middleware/authorized.ts @@ -73,7 +73,6 @@ const checkAuthorizedResource = async ( export = (permType: any, permLevel: any = null, opts = { schema: false }) => async (ctx: any, next: any) => { - console.log(ctx) // webhooks don't need authentication, each webhook unique // also internal requests (between services) don't need authorized if (isWebhookEndpoint(ctx) || ctx.internal) { From 96576714e90524a6fe67117776cf555d4860770c Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 14 Jul 2022 11:43:09 +0100 Subject: [PATCH 039/179] fix table overflow --- packages/bbui/src/Table/Table.svelte | 2 +- .../builder/portal/overview/_components/AccessTab.svelte | 4 ++-- .../builder/portal/overview/_components/OverviewTab.svelte | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 27e285308d..c929e02d86 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -447,7 +447,7 @@ width: 100%; border-radius: 0; display: grid; - overflow: visible; + overflow: auto; } /* Header */ diff --git a/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte index 79b2013532..fd423354e9 100644 --- a/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte +++ b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte @@ -30,8 +30,8 @@ $: page = $pageInfo.page $: fetchUsers(page, search) - $: isProPlan = $auth.user?.license.plan.type === Constants.PlanType.FREE - + $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE + $: console.log(isProPlan) $: appUsers = $users.data?.filter(x => { return Object.keys(x.roles).find(y => { diff --git a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte index 33a51e637b..43baf54b20 100644 --- a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte +++ b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte @@ -19,7 +19,7 @@ } let appEditor, appEditorPromise - $: console.log($users.data) + $: updateAvailable = clientPackage.version !== $store.version $: isPublished = app && app?.status === AppStatus.DEPLOYED $: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy From 835c4e390da6a01efcd3c27dc23357482073478d Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 14:15:12 +0100 Subject: [PATCH 040/179] fixed issue bulkDelete losing context because of a forEach loop --- packages/worker/src/api/controllers/global/users.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index d25d8b6da3..304584dea2 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -148,12 +148,13 @@ export const destroy = async (ctx: any) => { export const bulkDelete = async (ctx: any) => { const { userIds } = ctx.request.body - let deleted = 0 - userIds.forEach(async (id: any) => { + + for (const id of userIds) { await users.destroy(id, ctx.user) deleted++ - }) + } + ctx.body = { message: `${deleted} user(s) deleted`, } From 2d12970c5898f435235c01a8142f2f0843e8ee5f Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 15:29:30 +0100 Subject: [PATCH 041/179] exported deleteUserModal as component --- .../portal/manage/users/[userId].svelte | 32 +++---------------- .../users/_components/DeleteUserModal.svelte | 31 ++++++++++++++++++ 2 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/DeleteUserModal.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index 6dfb139fa3..287fa0f57e 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -17,7 +17,6 @@ Popover, Select, Modal, - ModalContent, notifications, StatusLight, } from "@budibase/bbui" @@ -29,10 +28,11 @@ import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" import { RoleUtils } from "@budibase/frontend-core" import UserGroupPicker from "components/settings/UserGroupPicker.svelte" + import DeleteUserModal from "./_components/DeleteUserModal.svelte" export let userId - let deleteUserModal + let deleteModal let resetPasswordModal let popoverAnchor let searchTerm = "" @@ -83,15 +83,6 @@ : "appUser" const userFetch = fetchData(`/api/global/users/${userId}`) - async function deleteUser() { - try { - await users.delete(userId) - notifications.success(`User ${$userFetch?.data?.email} deleted.`) - $goto("./") - } catch (error) { - notifications.error("Error deleting user") - } - } function getHighestRole(roles) { let highestRole @@ -207,9 +198,7 @@ Force Password Reset - Delete + Delete @@ -331,19 +320,8 @@ - - - - Are you sure you want to delete {$userFetch?.data?.email} - - + + + import { goto } from "@roxi/routify" + import { Body, ModalContent, notifications } from "@budibase/bbui" + + import { users } from "stores/portal" + + export let user + + async function deleteUser() { + try { + await users.delete(user._id) + notifications.success(`User ${user?.email} deleted.`) + $goto("./") + } catch (error) { + notifications.error("Error deleting user") + } + } + + + + + Are you sure you want to delete {user?.email} + + From 738733b8b9d71aacdbe52a4f8a03b2c88a19bb38 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 15:36:35 +0100 Subject: [PATCH 042/179] amended icons --- .../portal/manage/groups/_components/UserGroupsRow.svelte | 3 +-- .../manage/users/_components/SettingsTableRenderer.svelte | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte index 478608f2d4..e00123614a 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -65,8 +65,7 @@ deleteGroup(group)} icon="Delete" >Delete - editGroup(group)} icon="Delete">Edit + editGroup(group)} icon="Edit">Edit diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte index 37ce58a0b7..e32072d5e1 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte @@ -11,6 +11,6 @@ Delete - Edit + Edit From 66e88b37c3b1f3c79144f60f7f0cec8dabfe839f Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 15:59:06 +0100 Subject: [PATCH 043/179] removed duplicated behaviour in user table --- .../_components/SettingsTableRenderer.svelte | 16 ---------------- .../builder/portal/manage/users/index.svelte | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte deleted file mode 100644 index e32072d5e1..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/SettingsTableRenderer.svelte +++ /dev/null @@ -1,16 +0,0 @@ - - -
- - - - - Delete - Edit - -
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 0a765c44e9..938f92850b 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -21,7 +21,6 @@ import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte" import AppsTableRenderer from "./_components/AppsTableRenderer.svelte" import NameTableRenderer from "./_components/NameTableRenderer.svelte" - import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" import RoleTableRenderer from "./_components/RoleTableRenderer.svelte" import { goto } from "@roxi/routify" import OnboardingTypeModal from "./_components/OnboardingTypeModal.svelte" @@ -62,7 +61,6 @@ { column: "userGroups", component: GroupsTableRenderer }, { column: "apps", component: AppsTableRenderer }, { column: "name", component: NameTableRenderer }, - { column: "settings", component: SettingsTableRenderer }, { column: "role", component: RoleTableRenderer }, ] From afee19c361902913f4ceb183bf74d4c6de83c1aa Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Thu, 14 Jul 2022 16:55:19 +0100 Subject: [PATCH 044/179] changing user roles from users table --- .../_components/RoleTableRenderer.svelte | 36 +++++++++++++++---- packages/builder/src/stores/portal/users.js | 4 +++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte index 66f133663f..1bc820be72 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte @@ -1,15 +1,37 @@
-
diff --git a/packages/frontend-core/src/themes/midnight.css b/packages/frontend-core/src/themes/midnight.css new file mode 100644 index 0000000000..e69de29bb2 From 3aef4d8e4986db6374a6ca413114ae581efb1f44 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Jul 2022 13:41:30 +0100 Subject: [PATCH 125/179] Don't load theme options from the store --- packages/builder/src/builderStore/store/theme.js | 5 ++--- packages/builder/src/main.js | 1 + .../builder/src/pages/builder/portal/settings/theming.svelte | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/builderStore/store/theme.js b/packages/builder/src/builderStore/store/theme.js index 8ddbd7678a..54323ba55f 100644 --- a/packages/builder/src/builderStore/store/theme.js +++ b/packages/builder/src/builderStore/store/theme.js @@ -1,11 +1,10 @@ -import { createLocalStorageStore } from "@budibase/frontend-core" +import { Constants, createLocalStorageStore } from "@budibase/frontend-core" export const getThemeStore = () => { const themeElement = document.documentElement const initialValue = { theme: "darkest", - options: ["lightest", "light", "dark", "darkest", "nord"], } const store = createLocalStorageStore("bb-theme", initialValue) @@ -17,7 +16,7 @@ export const getThemeStore = () => { return } - state.options.forEach(option => { + Constants.ThemeOptions.forEach(option => { themeElement.classList.toggle( `spectrum--${option}`, option === state.theme diff --git a/packages/builder/src/main.js b/packages/builder/src/main.js index 8ab2c16ba2..dc1e1cf1bf 100644 --- a/packages/builder/src/main.js +++ b/packages/builder/src/main.js @@ -6,6 +6,7 @@ import "@spectrum-css/vars/dist/spectrum-dark.css" import "@spectrum-css/vars/dist/spectrum-light.css" import "@spectrum-css/vars/dist/spectrum-lightest.css" import "@budibase/frontend-core/src/themes/nord.css" +import "@budibase/frontend-core/src/themes/midnight.css" import "@spectrum-css/page/dist/index-vars.css" import "./global.css" import { suppressWarnings } from "./helpers/warnings" diff --git a/packages/builder/src/pages/builder/portal/settings/theming.svelte b/packages/builder/src/pages/builder/portal/settings/theming.svelte index 2a2aaa8a3b..2a8e82f0e5 100644 --- a/packages/builder/src/pages/builder/portal/settings/theming.svelte +++ b/packages/builder/src/pages/builder/portal/settings/theming.svelte @@ -2,6 +2,7 @@ import { Layout, Heading, Body, Divider, Label, Select } from "@budibase/bbui" import { themeStore } from "builderStore" import { capitalise } from "helpers" + import { Constants } from "@budibase/frontend-core" @@ -14,7 +15,7 @@