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

Merge remote-tracking branch 'origin/develop' into fix/licensing-overlay-flags

This commit is contained in:
Dean 2022-09-23 17:40:19 +01:00
parent e199bd410a 3e5b6dd9c7
commit 80028f3cd7
21 changed files with 155 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.4.8-alpha.5",
"@budibase/types": "1.4.8-alpha.6",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.6",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -71,10 +71,10 @@
}
},
"dependencies": {
"@budibase/bbui": "1.4.8-alpha.5",
"@budibase/client": "1.4.8-alpha.5",
"@budibase/frontend-core": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/bbui": "1.4.8-alpha.6",
"@budibase/client": "1.4.8-alpha.6",
"@budibase/frontend-core": "1.4.8-alpha.6",
"@budibase/string-templates": "1.4.8-alpha.6",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

31
packages/builder/src/components/portal/licensing/DeleteLicenseKeyModal.svelte Normal file
View File

@ -0,0 +1,31 @@
<script>
import { Modal, ModalContent, Body } from "@budibase/bbui"
let modal
export let onConfirm
export function show() {
modal.show()
}
export function hide() {
modal.hide()
}
</script>
<Modal bind:this={modal} on:hide={modal}>
<ModalContent
title="Confirm deletion"
size="S"
showCancelButton={true}
confirmText={"Confirm"}
{onConfirm}
>
<Body size="S">Are you sure you want to delete this license key?</Body>
<Body size="S">This license key cannot be re-activated.</Body>
</ModalContent>
</Modal>
<style>
</style>

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

@ -9,7 +9,7 @@
Tags,
notifications,
} from "@budibase/bbui"
import { groups, auth, licensing } from "stores/portal"
import { groups, auth, licensing, admin } from "stores/portal"
import { onMount } from "svelte"
import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
import UserGroupsRow from "./_components/UserGroupsRow.svelte"
@ -53,6 +53,8 @@
onMount(async () => {
try {
// always load latest
await licensing.init()
if ($licensing.groupsEnabled) {
await groups.actions.init()
}
@ -77,7 +79,7 @@
{/if}
</div>
<Body>Easily assign and manage your users access with User Groups</Body>
{#if !$auth.accountPortalAccess}
{#if !$auth.accountPortalAccess && $admin.cloud}
<Body>Contact your account holder to upgrade</Body>
{/if}
</Layout>
@ -90,7 +92,7 @@
{:else}
<Button
newStyles
disabled={!$auth.accountPortalAccess}
disabled={!$auth.accountPortalAccess && $admin.cloud}
on:click={$licensing.goToUpgradePage()}
>
Upgrade

43
packages/builder/src/pages/builder/portal/settings/upgrade.svelte
View File

@ -13,6 +13,7 @@
import { auth, admin } from "stores/portal"
import { redirect } from "@roxi/routify"
import { processStringSync } from "@budibase/string-templates"
import DeleteLicenseKeyModal from "../../../../components/portal/licensing/DeleteLicenseKeyModal.svelte"
import { API } from "api"
import { onMount } from "svelte"
@ -26,6 +27,7 @@
let licenseKeyDisabled = false
let licenseKeyType = "text"
let licenseKey = ""
let deleteLicenseKeyModal
// Make sure page can't be visited directly in cloud
$: {
@ -45,6 +47,20 @@
}
}
const destroy = async () => {
try {
await API.deleteLicenseKey({ licenseKey })
await auth.getSelf()
await setLicenseInfo()
// reset the form
licenseKey = ""
licenseKeyDisabled = false
notifications.success("Successfully deleted")
} catch (e) {
notifications.error(e.message)
}
}
const refresh = async () => {
try {
await API.refreshLicense()
@ -76,6 +92,10 @@
</script>
{#if $auth.isAdmin}
<DeleteLicenseKeyModal
bind:this={deleteLicenseKeyModal}
onConfirm={destroy}
/>
<Layout noPadding>
<Layout gap="XS" noPadding>
<Heading size="M">Upgrade</Heading>
@ -109,10 +129,19 @@
/>
</div>
</div>
<div>
<Button cta on:click={activate} disabled={activateDisabled}
>Activate</Button
>
<div class="button-container">
<div class="action-button">
<Button cta on:click={activate} disabled={activateDisabled}
>Activate</Button
>
</div>
<div class="action-button">
{#if licenseInfo?.licenseKey}
<Button warning on:click={() => deleteLicenseKeyModal.show()}
>Delete</Button
>
{/if}
</div>
</div>
</Layout>
<Divider size="S" />
@ -152,4 +181,10 @@
grid-gap: var(--spacing-l);
align-items: center;
}
.action-button {
margin-right: 10px;
}
.button-container {
display: flex;
}
</style>

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/types": "1.4.8-alpha.5",
"@budibase/backend-core": "1.4.8-alpha.6",
"@budibase/string-templates": "1.4.8-alpha.6",
"@budibase/types": "1.4.8-alpha.6",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "1.4.8-alpha.5",
"@budibase/frontend-core": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/bbui": "1.4.8-alpha.6",
"@budibase/frontend-core": "1.4.8-alpha.6",
"@budibase/string-templates": "1.4.8-alpha.6",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "1.4.8-alpha.5",
"@budibase/bbui": "1.4.8-alpha.6",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

9
packages/frontend-core/src/api/licensing.js
View File

@ -9,6 +9,15 @@ export const buildLicensingEndpoints = API => ({
})
},
/**
* Delete a self hosted license key
*/
deleteLicenseKey: async () => {
return API.delete({
url: `/api/global/license/info`,
})
},
/**
* Get the license info - metadata about the license including the
* obfuscated license key.

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "1.4.8-alpha.5",
"@budibase/client": "1.4.8-alpha.5",
"@budibase/pro": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/types": "1.4.8-alpha.5",
"@budibase/backend-core": "1.4.8-alpha.6",
"@budibase/client": "1.4.8-alpha.6",
"@budibase/pro": "1.4.8-alpha.6",
"@budibase/string-templates": "1.4.8-alpha.6",
"@budibase/types": "1.4.8-alpha.6",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

1
packages/server/scripts/dev/manage.js
View File

@ -59,6 +59,7 @@ async function init() {
BB_ADMIN_USER_EMAIL: "",
BB_ADMIN_USER_PASSWORD: "",
PLUGINS_DIR: "",
TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS",
}
let envFile = ""
Object.keys(envFileJson).forEach(key => {

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.5.tgz#4ad0c37d2440214aaeb06ddd6c779a60046ecbf2"
integrity sha512-GwdWTluKYRzBt73JAeSJVRbbL2BM3qSPYYsVRvJl5nwvns2COvlK0LyuioR+HmTRsEIinPvMvsOuSJ795+gdtA==
"@budibase/backend-core@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4"
integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw==
dependencies:
"@budibase/types" "1.4.8-alpha.5"
"@budibase/types" "1.4.8-alpha.6"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.5.tgz#8d9015a6ce36b21f336fe54a382ea51e169e989f"
integrity sha512-J3iUMIdO7RhrC24MbZafRRsANnnRh7XZvHwKuesZBHGFy9eHPzYtY3ZtIekk//X0xbUmCUp/l4BIVSFgAtGJ9Q==
"@budibase/pro@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563"
integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA==
dependencies:
"@budibase/backend-core" "1.4.8-alpha.5"
"@budibase/types" "1.4.8-alpha.5"
"@budibase/backend-core" "1.4.8-alpha.6"
"@budibase/types" "1.4.8-alpha.6"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.5.tgz#2945af47862284a4becd4978891d64f4fef5c83a"
integrity sha512-6BXAUAaIkW9Q7C0blqNY+W5+yE1zFwqK7M1cUIfjo/+5OotOKgtrR3SN47w4BDFflixxTVdmpgWI/ELi7fZU4A==
"@budibase/types@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48"
integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA==
"@bull-board/api@3.7.0":
version "3.7.0"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.4.8-alpha.5",
"version": "1.4.8-alpha.6",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.4.8-alpha.5",
"@budibase/pro": "1.4.8-alpha.5",
"@budibase/string-templates": "1.4.8-alpha.5",
"@budibase/types": "1.4.8-alpha.5",
"@budibase/backend-core": "1.4.8-alpha.6",
"@budibase/pro": "1.4.8-alpha.6",
"@budibase/string-templates": "1.4.8-alpha.6",
"@budibase/types": "1.4.8-alpha.6",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

1
packages/worker/scripts/dev/manage.js
View File

@ -28,6 +28,7 @@ async function init() {
APPS_URL: "http://localhost:4001",
SERVICE: "worker-service",
DEPLOYMENT_ENVIRONMENT: "development",
TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS",
}
let envFile = ""
Object.keys(envFileJson).forEach(key => {

5
packages/worker/src/api/controllers/global/license.ts
View File

@ -24,6 +24,11 @@ export const getInfo = async (ctx: any) => {
ctx.status = 200
}
export const deleteInfo = async (ctx: any) => {
await licensing.deleteLicenseInfo()
ctx.status = 200
}
export const getQuotaUsage = async (ctx: any) => {
ctx.body = await quotas.getQuotaUsage()
}

1
packages/worker/src/api/routes/global/license.ts
View File

@ -7,6 +7,7 @@ router
.post("/api/global/license/activate", controller.activate)
.post("/api/global/license/refresh", controller.refresh)
.get("/api/global/license/info", controller.getInfo)
.delete("/api/global/license/info", controller.deleteInfo)
.get("/api/global/license/usage", controller.getQuotaUsage)
export = router

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.5.tgz#4ad0c37d2440214aaeb06ddd6c779a60046ecbf2"
integrity sha512-GwdWTluKYRzBt73JAeSJVRbbL2BM3qSPYYsVRvJl5nwvns2COvlK0LyuioR+HmTRsEIinPvMvsOuSJ795+gdtA==
"@budibase/backend-core@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4"
integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw==
dependencies:
"@budibase/types" "1.4.8-alpha.5"
"@budibase/types" "1.4.8-alpha.6"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.5.tgz#8d9015a6ce36b21f336fe54a382ea51e169e989f"
integrity sha512-J3iUMIdO7RhrC24MbZafRRsANnnRh7XZvHwKuesZBHGFy9eHPzYtY3ZtIekk//X0xbUmCUp/l4BIVSFgAtGJ9Q==
"@budibase/pro@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563"
integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA==
dependencies:
"@budibase/backend-core" "1.4.8-alpha.5"
"@budibase/types" "1.4.8-alpha.5"
"@budibase/backend-core" "1.4.8-alpha.6"
"@budibase/types" "1.4.8-alpha.6"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.4.8-alpha.5":
version "1.4.8-alpha.5"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.5.tgz#2945af47862284a4becd4978891d64f4fef5c83a"
integrity sha512-6BXAUAaIkW9Q7C0blqNY+W5+yE1zFwqK7M1cUIfjo/+5OotOKgtrR3SN47w4BDFflixxTVdmpgWI/ELi7fZU4A==
"@budibase/types@1.4.8-alpha.6":
version "1.4.8-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48"
integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"