MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

saving and fetching groups from couch

This commit is contained in:
Peter Clement 2022-06-15 16:51:30 +01:00
parent 4fd1fb9e03
commit 4ab7e8cd11
12 changed files with 194 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@ -3,5 +3,8 @@
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll": true "source.fixAll": true
}, },
"editor.defaultFormatter": "svelte.svelte-vscode" "editor.defaultFormatter": "svelte.svelte-vscode",
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
} }

1
packages/backend-core/src/db/constants.js
View File

@ -15,6 +15,7 @@ exports.DocumentTypes = {
ROLE: "role", ROLE: "role",
MIGRATIONS: "migrations", MIGRATIONS: "migrations",
DEV_INFO: "devinfo", DEV_INFO: "devinfo",
GROUP: "gr"
} }
exports.StaticDatabases = { exports.StaticDatabases = {

23
packages/backend-core/src/db/utils.js
View File

@ -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. * Generates a new role ID.
* @returns {string} The new role ID which the role doc can be stored under. * @returns {string} The new role ID which the role doc can be stored under.

2
packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte
View File

@ -20,7 +20,7 @@
<div class="desktop tableElement"> <div class="desktop tableElement">
<Icon name="User" /> <Icon name="User" />
<div style="margin-left: var(--spacing-l"> <div style="margin-left: var(--spacing-l">
{parseInt(userCount)} app{parseInt(userCount) === 1 ? "" : "s"} {parseInt(userCount)} user{parseInt(userCount) === 1 ? "" : "s"}
</div> </div>
</div> </div>
<div class="desktop tableElement"> <div class="desktop tableElement">

54
packages/builder/src/pages/builder/portal/manage/groups/index.svelte
View File

@ -12,30 +12,37 @@
Tags, Tags,
IconPicker, IconPicker,
} from "@budibase/bbui" } from "@budibase/bbui"
import { API } from "api"
import { groups } from "stores/portal"
import { onMount } from "svelte"
import UserGroupsRow from "./_components/UserGroupsRow.svelte" import UserGroupsRow from "./_components/UserGroupsRow.svelte"
let modal let modal
let selectedColor let selectedColor
let selectedIcon let selectedIcon
let groupName
let proPlan = true let proPlan = true
let userGroupData = [ async function saveConfig() {
{ try {
_id: "gr_123456", API.saveGroup({
color: "green", color: selectedColor,
icon: "Anchor", icon: selectedIcon,
name: "Core Team", name: groupName,
userCount: 5, })
appCount: 2, } catch (error) {
}, notifications.error(`Failed to save group`)
{ }
_id: "gr_45678", }
color: "red",
icon: "Beaker", onMount(async () => {
name: "QA Team", try {
userCount: 3, await groups.init()
appCount: 7, } catch (error) {
}, notifications.error("Error getting User groups")
] }
})
</script> </script>
<Layout noPadding> <Layout noPadding>
@ -72,7 +79,7 @@
</div> </div>
<div class="groupTable"> <div class="groupTable">
{#each userGroupData as group} {#each $groups as group}
<div> <div>
<UserGroupsRow {group} /> <UserGroupsRow {group} />
</div> </div>
@ -81,8 +88,13 @@
</Layout> </Layout>
<Modal bind:this={modal}> <Modal bind:this={modal}>
<ModalContent size="M" title="Create User Group" confirmText="Save"> <ModalContent
<Input label="Team name" /> onConfirm={saveConfig}
size="M"
title="Create User Group"
confirmText="Save"
>
<Input bind:value={groupName} label="Team name" />
<div class="modal-format"> <div class="modal-format">
<div class="modal-inner"> <div class="modal-inner">
<Body size="XS">Icon</Body> <Body size="XS">Icon</Body>

24
packages/builder/src/stores/portal/groups.js Normal file
View File

@ -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()

1
packages/builder/src/stores/portal/index.js
View File

@ -7,3 +7,4 @@ export { auth } from "./auth"
export { oidc } from "./oidc" export { oidc } from "./oidc"
export { templates } from "./templates" export { templates } from "./templates"
export { licensing } from "./licensing" export { licensing } from "./licensing"
export { groups } from "./groups"

18
packages/frontend-core/src/api/groups.js Normal file
View File

@ -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",
})
}
})

2
packages/frontend-core/src/api/index.js
View File

@ -23,6 +23,7 @@ import { buildUserEndpoints } from "./user"
import { buildSelfEndpoints } from "./self" import { buildSelfEndpoints } from "./self"
import { buildViewEndpoints } from "./views" import { buildViewEndpoints } from "./views"
import { buildLicensingEndpoints } from "./licensing" import { buildLicensingEndpoints } from "./licensing"
import { buildGroupsEndpoints } from "./groups"
const defaultAPIClientConfig = { const defaultAPIClientConfig = {
/** /**
@ -235,5 +236,6 @@ export const createAPIClient = config => {
...buildViewEndpoints(API), ...buildViewEndpoints(API),
...buildSelfEndpoints(API), ...buildSelfEndpoints(API),
...buildLicensingEndpoints(API), ...buildLicensingEndpoints(API),
...buildGroupsEndpoints(API)
} }
} }

58
packages/worker/src/api/controllers/global/groups.js Normal file
View File

@ -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)
}
}

27
packages/worker/src/api/routes/global/groups.js Normal file
View File

@ -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

3
packages/worker/src/api/routes/index.js
View File

@ -11,7 +11,7 @@ const tenantsRoutes = require("./system/tenants")
const statusRoutes = require("./system/status") const statusRoutes = require("./system/status")
const selfRoutes = require("./global/self") const selfRoutes = require("./global/self")
const licenseRoutes = require("./global/license") const licenseRoutes = require("./global/license")
const userGroupRoutes = require("./global/groups")
exports.routes = [ exports.routes = [
configRoutes, configRoutes,
userRoutes, userRoutes,
@ -26,4 +26,5 @@ exports.routes = [
statusRoutes, statusRoutes,
selfRoutes, selfRoutes,
licenseRoutes, licenseRoutes,
userGroupRoutes
] ]