Merge branch 'develop' of github.com:Budibase/budibase into group-fixes
This commit is contained in:
mike12345567
commit
8830ba1827
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
declare -a ENV_VARS=("COUCHDB_USER" "COUCHDB_PASSWORD" "DATA_DIR" "MINIO_ACCESS_KEY" "MINIO_SECRET_KEY" "INTERNAL_API_KEY" "JWT_SECRET" "REDIS_PASSWORD")
|
||||
declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONMENT" "CLUSTER_PORT" "DEPLOYMENT_ENVIRONMENT" "MINIO_URL" "NODE_ENV" "POSTHOG_TOKEN" "REDIS_URL" "SELF_HOSTED" "WORKER_PORT" "WORKER_URL" "TENANT_FEATURE_FLAGS")
|
||||
declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONMENT" "CLUSTER_PORT" "DEPLOYMENT_ENVIRONMENT" "MINIO_URL" "NODE_ENV" "POSTHOG_TOKEN" "REDIS_URL" "SELF_HOSTED" "WORKER_PORT" "WORKER_URL" "TENANT_FEATURE_FLAGS" "ACCOUNT_PORTAL_URL")
|
||||
# Check the env vars set in Dockerfile have come through, AAS seems to drop them
|
||||
[[ -z "${APP_PORT}" ]] && export APP_PORT=4001
|
||||
[[ -z "${ARCHITECTURE}" ]] && export ARCHITECTURE=amd
|
||||
|
|
@ -11,6 +11,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
|
|||
[[ -z "${NODE_ENV}" ]] && export NODE_ENV=production
|
||||
[[ -z "${POSTHOG_TOKEN}" ]] && export POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
|
||||
[[ -z "${TENANT_FEATURE_FLAGS}" ]] && export TENANT_FEATURE_FLAGS="*:LICENSING,*:USER_GROUPS"
|
||||
[[ -z "${ACCOUNT_PORTAL_URL}" ]] && export ACCOUNT_PORTAL_URL=https://account.budibase.app
|
||||
[[ -z "${REDIS_URL}" ]] && export REDIS_URL=localhost:6379
|
||||
[[ -z "${SELF_HOSTED}" ]] && export SELF_HOSTED=1
|
||||
[[ -z "${WORKER_PORT}" ]] && export WORKER_PORT=4002
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/types": "1.4.8-alpha.5",
|
||||
"@shopify/jest-koa-mocks": "5.0.1",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
"aws-sdk": "2.1030.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.5",
|
||||
"@spectrum-css/actionbutton": "^1.0.1",
|
||||
"@spectrum-css/actiongroup": "^1.0.1",
|
||||
"@spectrum-css/avatar": "^3.0.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "1.4.8-alpha.3",
|
||||
"@budibase/client": "1.4.8-alpha.3",
|
||||
"@budibase/frontend-core": "1.4.8-alpha.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.3",
|
||||
"@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",
|
||||
"@sentry/browser": "5.19.1",
|
||||
"@spectrum-css/page": "^3.0.1",
|
||||
"@spectrum-css/vars": "^3.0.1",
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
{
|
||||
key: ExpiringKeys.LICENSING_PAYMENT_FAILED,
|
||||
criteria: () => {
|
||||
return $licensing.accountPastDue && !$licensing.isFreePlan()
|
||||
return $licensing.accountPastDue && !$licensing.isFreePlan
|
||||
},
|
||||
action: () => {
|
||||
paymentFailedModal.show()
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ const buildPaymentFailedBanner = () => {
|
|||
key: "payment_Failed",
|
||||
type: BANNER_TYPES.NEGATIVE,
|
||||
criteria: () => {
|
||||
return get(licensing)?.accountPastDue && !get(licensing).isFreePlan()
|
||||
return get(licensing)?.accountPastDue && !get(licensing).isFreePlan
|
||||
},
|
||||
message: `Payment Failed - Please update your billing details or your account will be downgrades in
|
||||
${get(licensing)?.pastDueDaysRemaining} day${
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
onMount(async () => {
|
||||
try {
|
||||
await templates.load()
|
||||
await licensing.getQuotaUsage()
|
||||
await licensing.getUsageMetrics()
|
||||
// always load latest
|
||||
await licensing.init()
|
||||
if ($templates?.length === 0) {
|
||||
notifications.error(
|
||||
"There was a problem loading quick start templates."
|
||||
|
|
|
|||
|
|
@ -229,9 +229,8 @@
|
|||
try {
|
||||
await apps.load()
|
||||
await templates.load()
|
||||
|
||||
await licensing.getQuotaUsage()
|
||||
await licensing.getUsageMetrics()
|
||||
// always load latest
|
||||
await licensing.init()
|
||||
|
||||
if ($templates?.length === 0) {
|
||||
notifications.error(
|
||||
|
|
@ -361,7 +360,7 @@
|
|||
</Button>
|
||||
{/if}
|
||||
<div class="filter">
|
||||
{#if $auth.groupsEnabled}
|
||||
{#if $licensing.groupsEnabled}
|
||||
<AccessFilter on:change={accessFilterAction} />
|
||||
{/if}
|
||||
<Select
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
Search,
|
||||
notifications,
|
||||
} from "@budibase/bbui"
|
||||
import { groups, auth } from "stores/portal"
|
||||
import { groups, auth, licensing } from "stores/portal"
|
||||
import { onMount } from "svelte"
|
||||
import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
|
||||
import { cloneDeep } from "lodash/fp"
|
||||
|
|
@ -78,7 +78,9 @@
|
|||
|
||||
onMount(async () => {
|
||||
try {
|
||||
await groups.actions.init()
|
||||
if ($licensing.groupsEnabled) {
|
||||
await groups.actions.init()
|
||||
}
|
||||
} catch (error) {
|
||||
notifications.error("Error getting user groups")
|
||||
}
|
||||
|
|
@ -88,7 +90,7 @@
|
|||
<Layout noPadding gap="M">
|
||||
<Layout gap="XS" noPadding>
|
||||
<Heading size="M">User groups</Heading>
|
||||
{#if !$auth.groupsEnabled}
|
||||
{#if !$licensing.groupsEnabled}
|
||||
<Tags>
|
||||
<div class="tags">
|
||||
<div class="tag">
|
||||
|
|
@ -98,21 +100,32 @@
|
|||
</Tags>
|
||||
{/if}
|
||||
<Body>Easily assign and manage your users' access with user groups</Body>
|
||||
{#if !$auth.accountPortalAccess}
|
||||
<Body>Contact your account holder to upgrade</Body>
|
||||
{/if}
|
||||
</Layout>
|
||||
<Divider />
|
||||
<div class="controls">
|
||||
<ButtonGroup>
|
||||
<Button
|
||||
newStyles
|
||||
icon={$auth.groupsEnabled ? "UserGroup" : ""}
|
||||
cta={$auth.groupsEnabled}
|
||||
on:click={$auth.groupsEnabled
|
||||
? showCreateGroupModal
|
||||
: window.open("https://budibase.com/pricing/", "_blank")}
|
||||
>
|
||||
{$auth.groupsEnabled ? "Create user group" : "Upgrade Account"}
|
||||
</Button>
|
||||
{#if !$auth.groupsEnabled}
|
||||
{#if $licensing.groupsEnabled}
|
||||
<!--Show the group create button-->
|
||||
<Button
|
||||
newStyles
|
||||
icon={"UserGroup"}
|
||||
cta
|
||||
on:click={showCreateGroupModal}
|
||||
>
|
||||
Create user group
|
||||
</Button>
|
||||
{:else}
|
||||
<Button
|
||||
newStyles
|
||||
disabled={!$auth.accountPortalAccess}
|
||||
on:click={$licensing.goToUpgradePage()}
|
||||
>
|
||||
Upgrade
|
||||
</Button>
|
||||
<!--Show the view plans button-->
|
||||
<Button
|
||||
newStyles
|
||||
secondary
|
||||
|
|
|
|||
|
|
@ -23,14 +23,13 @@
|
|||
StatusLight,
|
||||
} from "@budibase/bbui"
|
||||
import { onMount } from "svelte"
|
||||
import { users, auth, groups, apps } from "stores/portal"
|
||||
import { users, auth, groups, apps, licensing } from "stores/portal"
|
||||
import { roles } from "stores/backend"
|
||||
import { Constants } from "@budibase/frontend-core"
|
||||
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"
|
||||
import GroupIcon from "../groups/_components/GroupIcon.svelte"
|
||||
import { Constants, RoleUtils } from "@budibase/frontend-core"
|
||||
|
||||
export let userId
|
||||
|
||||
|
|
@ -256,7 +255,7 @@
|
|||
</Layout>
|
||||
</Layout>
|
||||
|
||||
{#if $auth.groupsEnabled}
|
||||
{#if $licensing.groupsEnabled}
|
||||
<!-- User groups -->
|
||||
<Layout gap="S" noPadding>
|
||||
<div class="tableTitle">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
Layout,
|
||||
Icon,
|
||||
} from "@budibase/bbui"
|
||||
import { groups, auth } from "stores/portal"
|
||||
import { groups, licensing } from "stores/portal"
|
||||
import { Constants } from "@budibase/frontend-core"
|
||||
import { emailValidator } from "helpers/validation"
|
||||
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
</div>
|
||||
</Layout>
|
||||
|
||||
{#if $auth.groupsEnabled}
|
||||
{#if $licensing.groupsEnabled}
|
||||
<Multiselect
|
||||
bind:value={userGroups}
|
||||
placeholder="No groups"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { Body, ModalContent, Table } from "@budibase/bbui"
|
||||
import { onMount } from "svelte"
|
||||
|
||||
export let userData
|
||||
export let deleteUsersResponse
|
||||
|
||||
let successCount
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
Multiselect,
|
||||
notifications,
|
||||
} from "@budibase/bbui"
|
||||
import { groups, auth, admin } from "stores/portal"
|
||||
import { groups, licensing, admin } from "stores/portal"
|
||||
import { emailValidator } from "helpers/validation"
|
||||
import { Constants } from "@budibase/frontend-core"
|
||||
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
options={Constants.BuilderRoleDescriptions}
|
||||
/>
|
||||
|
||||
{#if $auth.groupsEnabled}
|
||||
{#if $licensing.groupsEnabled}
|
||||
<Multiselect
|
||||
bind:value={userGroups}
|
||||
placeholder="No groups"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
Divider,
|
||||
} from "@budibase/bbui"
|
||||
import AddUserModal from "./_components/AddUserModal.svelte"
|
||||
import { users, groups, auth } from "stores/portal"
|
||||
import { users, groups, auth, licensing } from "stores/portal"
|
||||
import { onMount } from "svelte"
|
||||
import DeleteRowsButton from "components/backend/DataTable/buttons/DeleteRowsButton.svelte"
|
||||
import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte"
|
||||
|
|
@ -60,11 +60,8 @@
|
|||
role: {
|
||||
sortable: false,
|
||||
},
|
||||
...($auth.groupsEnabled && {
|
||||
userGroups: {
|
||||
sortable: false,
|
||||
displayName: "User groups",
|
||||
},
|
||||
...($licensing.groupsEnabled && {
|
||||
userGroups: { sortable: false, displayName: "Groups" },
|
||||
}),
|
||||
apps: {
|
||||
sortable: false,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
import { onMount } from "svelte"
|
||||
|
||||
import RoleSelect from "components/common/RoleSelect.svelte"
|
||||
import { users, groups, apps, auth } from "stores/portal"
|
||||
import { users, groups, apps, licensing } from "stores/portal"
|
||||
import AssignmentModal from "./AssignmentModal.svelte"
|
||||
import { roles } from "stores/backend"
|
||||
import { API } from "api"
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
{#if $auth.groupsEnabled && appGroups.length}
|
||||
{#if $licensing.groupsEnabled && appGroups.length}
|
||||
<List title="User Groups">
|
||||
{#each appGroups as group}
|
||||
<ListItem
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
Icon,
|
||||
} from "@budibase/bbui"
|
||||
import { roles } from "stores/backend"
|
||||
import { groups, users, auth, apps } from "stores/portal"
|
||||
import { groups, users, licensing, apps } from "stores/portal"
|
||||
import { Constants, RoleUtils, fetchData } from "@budibase/frontend-core"
|
||||
import { API } from "api"
|
||||
import { createEventDispatcher } from "svelte"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
$: availableGroups = getAvailableGroups($groups, app.appId, search, data)
|
||||
$: valid = data?.length && !data?.some(x => !x.id?.length || !x.role?.length)
|
||||
$: optionSections = {
|
||||
...($auth.groupsEnabled &&
|
||||
...($licensing.groupsEnabled &&
|
||||
availableGroups.length && {
|
||||
["User groups"]: {
|
||||
data: availableGroups,
|
||||
|
|
|
|||
|
|
@ -147,7 +147,8 @@
|
|||
|
||||
const init = async () => {
|
||||
try {
|
||||
await licensing.getQuotaUsage()
|
||||
// always load latest
|
||||
await licensing.init()
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
notifications.error(e)
|
||||
|
|
|
|||
|
|
@ -2,23 +2,20 @@ import { derived, writable, get } from "svelte/store"
|
|||
import { API } from "api"
|
||||
import { admin } from "stores/portal"
|
||||
import analytics from "analytics"
|
||||
import { TENANT_FEATURE_FLAGS } from "helpers/featureFlags"
|
||||
import { Constants } from "@budibase/frontend-core"
|
||||
|
||||
export function createAuthStore() {
|
||||
const auth = writable({
|
||||
user: null,
|
||||
accountPortalAccess: false,
|
||||
tenantId: "default",
|
||||
tenantSet: false,
|
||||
loaded: false,
|
||||
postLogout: false,
|
||||
groupsEnabled: false,
|
||||
})
|
||||
const store = derived(auth, $store => {
|
||||
let initials = null
|
||||
let isAdmin = false
|
||||
let isBuilder = false
|
||||
let groupsEnabled = false
|
||||
if ($store.user) {
|
||||
const user = $store.user
|
||||
if (user.firstName) {
|
||||
|
|
@ -33,12 +30,10 @@ export function createAuthStore() {
|
|||
}
|
||||
isAdmin = !!user.admin?.global
|
||||
isBuilder = !!user.builder?.global
|
||||
groupsEnabled =
|
||||
user?.license.features.includes(Constants.Features.USER_GROUPS) &&
|
||||
user?.featureFlags.includes(TENANT_FEATURE_FLAGS.USER_GROUPS)
|
||||
}
|
||||
return {
|
||||
user: $store.user,
|
||||
accountPortalAccess: $store.accountPortalAccess,
|
||||
tenantId: $store.tenantId,
|
||||
tenantSet: $store.tenantSet,
|
||||
loaded: $store.loaded,
|
||||
|
|
@ -46,7 +41,6 @@ export function createAuthStore() {
|
|||
initials,
|
||||
isAdmin,
|
||||
isBuilder,
|
||||
groupsEnabled,
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -54,6 +48,7 @@ export function createAuthStore() {
|
|||
auth.update(store => {
|
||||
store.loaded = true
|
||||
store.user = user
|
||||
store.accountPortalAccess = user?.accountPortalAccess
|
||||
if (user) {
|
||||
store.tenantId = user.tenantId || "default"
|
||||
store.tenantSet = true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { writable, get } from "svelte/store"
|
||||
import { API } from "api"
|
||||
import { auth } from "stores/portal"
|
||||
import { licensing } from "stores/portal"
|
||||
|
||||
export function createGroupsStore() {
|
||||
const store = writable([])
|
||||
|
|
@ -26,7 +26,7 @@ export function createGroupsStore() {
|
|||
init: async () => {
|
||||
// only init if there is a groups license, just to be sure but the feature will be blocked
|
||||
// on the backend anyway
|
||||
if (get(auth).groupsEnabled) {
|
||||
if (get(licensing).groupsEnabled) {
|
||||
const groups = await API.getGroups()
|
||||
store.set(groups)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,31 @@
|
|||
import { writable, get } from "svelte/store"
|
||||
import { API } from "api"
|
||||
import { auth } from "stores/portal"
|
||||
import { auth, admin } from "stores/portal"
|
||||
import { Constants } from "@budibase/frontend-core"
|
||||
import { StripeStatus } from "components/portal/licensing/constants"
|
||||
import { TENANT_FEATURE_FLAGS, isEnabled } from "../../helpers/featureFlags"
|
||||
import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
|
||||
|
||||
export const createLicensingStore = () => {
|
||||
const DEFAULT = {
|
||||
plans: {},
|
||||
// navigation
|
||||
goToUpgradePage: () => {},
|
||||
// the top level license
|
||||
license: undefined,
|
||||
isFreePlan: true,
|
||||
// features
|
||||
groupsEnabled: false,
|
||||
// the currently used quotas from the db
|
||||
quotaUsage: undefined,
|
||||
// derived quota metrics for percentages used
|
||||
usageMetrics: {},
|
||||
// quota reset
|
||||
quotaResetDaysRemaining: undefined,
|
||||
quotaResetDate: undefined,
|
||||
// failed payments
|
||||
accountPastDue: undefined,
|
||||
pastDueEndDate: undefined,
|
||||
pastDueDaysRemaining: undefined,
|
||||
accountDowngraded: undefined,
|
||||
}
|
||||
const oneDayInMilliseconds = 86400000
|
||||
|
||||
|
|
@ -16,10 +33,39 @@ export const createLicensingStore = () => {
|
|||
|
||||
const actions = {
|
||||
init: async () => {
|
||||
await actions.getQuotaUsage()
|
||||
await actions.getUsageMetrics()
|
||||
actions.setNavigation()
|
||||
actions.setLicense()
|
||||
await actions.setQuotaUsage()
|
||||
actions.setUsageMetrics()
|
||||
},
|
||||
getQuotaUsage: async () => {
|
||||
setNavigation: () => {
|
||||
const upgradeUrl = `${get(admin).accountPortalUrl}/portal/upgrade`
|
||||
const goToUpgradePage = () => {
|
||||
window.location.href = upgradeUrl
|
||||
}
|
||||
store.update(state => {
|
||||
return {
|
||||
...state,
|
||||
goToUpgradePage,
|
||||
}
|
||||
})
|
||||
},
|
||||
setLicense: () => {
|
||||
const license = get(auth).user.license
|
||||
const isFreePlan = license?.plan.type === Constants.PlanType.FREE
|
||||
const groupsEnabled = license.features.includes(
|
||||
Constants.Features.USER_GROUPS
|
||||
)
|
||||
store.update(state => {
|
||||
return {
|
||||
...state,
|
||||
license,
|
||||
isFreePlan,
|
||||
groupsEnabled,
|
||||
}
|
||||
})
|
||||
},
|
||||
setQuotaUsage: async () => {
|
||||
const quotaUsage = await API.getQuotaUsage()
|
||||
store.update(state => {
|
||||
return {
|
||||
|
|
@ -28,7 +74,7 @@ export const createLicensingStore = () => {
|
|||
}
|
||||
})
|
||||
},
|
||||
getUsageMetrics: async () => {
|
||||
setUsageMetrics: () => {
|
||||
if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) {
|
||||
const quota = get(store).quotaUsage
|
||||
const license = get(auth).user.license
|
||||
|
|
@ -97,9 +143,6 @@ export const createLicensingStore = () => {
|
|||
accountPastDue: pastDueAtMilliseconds != null,
|
||||
pastDueEndDate,
|
||||
pastDueDaysRemaining,
|
||||
isFreePlan: () => {
|
||||
return license?.plan.type === Constants.PlanType.FREE
|
||||
},
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.3",
|
||||
"@budibase/types": "1.4.8-alpha.3",
|
||||
"@budibase/backend-core": "1.4.8-alpha.5",
|
||||
"@budibase/string-templates": "1.4.8-alpha.5",
|
||||
"@budibase/types": "1.4.8-alpha.5",
|
||||
"axios": "0.21.2",
|
||||
"chalk": "4.1.0",
|
||||
"cli-progress": "3.11.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/frontend-core": "1.4.8-alpha.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.3",
|
||||
"@budibase/bbui": "1.4.8-alpha.5",
|
||||
"@budibase/frontend-core": "1.4.8-alpha.5",
|
||||
"@budibase/string-templates": "1.4.8-alpha.5",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/bbui": "1.4.8-alpha.5",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ ENV BUDIBASE_ENVIRONMENT=PRODUCTION
|
|||
ENV SERVICE=app-service
|
||||
ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
|
||||
ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS
|
||||
ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
|
||||
|
||||
# copy files and install dependencies
|
||||
COPY . ./
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/client": "1.4.8-alpha.3",
|
||||
"@budibase/pro": "1.4.8-alpha.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.3",
|
||||
"@budibase/types": "1.4.8-alpha.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",
|
||||
"@bull-board/api": "3.7.0",
|
||||
"@bull-board/koa": "3.9.4",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
|||
|
|
@ -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.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.3.tgz#3a291fa610846cd2d15ec816974fe9b4ebc394b0"
|
||||
integrity sha512-MpZe5xe7mAuJ3sMh87E6go8XaUyCiAjyK+siubvYYP4zI3AVU60fF6rfHT7Q8Cl/taDVhrboDDbHTjk8jkwr5A==
|
||||
"@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==
|
||||
dependencies:
|
||||
"@budibase/types" "1.4.8-alpha.3"
|
||||
"@budibase/types" "1.4.8-alpha.5"
|
||||
"@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.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.3.tgz#20a6fe18b87ff73f699eda4b58741519f9aa6bb0"
|
||||
integrity sha512-m+yvK0okqz0pE6ILAGESETHJHLOgUz8l9+mj/Bc4Wu0P6WyW4li81Wlz9WDcwUW2bSjpuf/MC1CjG05iS4opTQ==
|
||||
"@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==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "1.4.8-alpha.3"
|
||||
"@budibase/types" "1.4.8-alpha.3"
|
||||
"@budibase/backend-core" "1.4.8-alpha.5"
|
||||
"@budibase/types" "1.4.8-alpha.5"
|
||||
"@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.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.3.tgz#85640009c992d37a56938fc601a786f5fd5e1739"
|
||||
integrity sha512-hqSGL0WXEtEuMsgAJ87jat/6MAUw7fFEuWRcUdnC9QtiF2yB4cjWStqVcfsBtiSt9VZ9xzNzcu1/++nPN/uF9w==
|
||||
"@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==
|
||||
|
||||
"@bull-board/api@3.7.0":
|
||||
version "3.7.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/types",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"description": "Budibase types",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@ ENV CLUSTER_MODE=${CLUSTER_MODE}
|
|||
ENV SERVICE=worker-service
|
||||
ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
|
||||
ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS
|
||||
ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
|
||||
|
||||
CMD ["./docker_run.sh"]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.4.8-alpha.3",
|
||||
"version": "1.4.8-alpha.5",
|
||||
"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.3",
|
||||
"@budibase/pro": "1.4.8-alpha.3",
|
||||
"@budibase/string-templates": "1.4.8-alpha.3",
|
||||
"@budibase/types": "1.4.8-alpha.3",
|
||||
"@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",
|
||||
"@koa/router": "8.0.8",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
|
|
|
|||
|
|
@ -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.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.3.tgz#3a291fa610846cd2d15ec816974fe9b4ebc394b0"
|
||||
integrity sha512-MpZe5xe7mAuJ3sMh87E6go8XaUyCiAjyK+siubvYYP4zI3AVU60fF6rfHT7Q8Cl/taDVhrboDDbHTjk8jkwr5A==
|
||||
"@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==
|
||||
dependencies:
|
||||
"@budibase/types" "1.4.8-alpha.3"
|
||||
"@budibase/types" "1.4.8-alpha.5"
|
||||
"@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.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.3.tgz#20a6fe18b87ff73f699eda4b58741519f9aa6bb0"
|
||||
integrity sha512-m+yvK0okqz0pE6ILAGESETHJHLOgUz8l9+mj/Bc4Wu0P6WyW4li81Wlz9WDcwUW2bSjpuf/MC1CjG05iS4opTQ==
|
||||
"@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==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "1.4.8-alpha.3"
|
||||
"@budibase/types" "1.4.8-alpha.3"
|
||||
"@budibase/backend-core" "1.4.8-alpha.5"
|
||||
"@budibase/types" "1.4.8-alpha.5"
|
||||
"@koa/router" "8.0.8"
|
||||
joi "17.6.0"
|
||||
node-fetch "^2.6.1"
|
||||
|
||||
"@budibase/types@1.4.8-alpha.3":
|
||||
version "1.4.8-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.3.tgz#85640009c992d37a56938fc601a786f5fd5e1739"
|
||||
integrity sha512-hqSGL0WXEtEuMsgAJ87jat/6MAUw7fFEuWRcUdnC9QtiF2yB4cjWStqVcfsBtiSt9VZ9xzNzcu1/++nPN/uF9w==
|
||||
"@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==
|
||||
|
||||
"@cspotcode/source-map-consumer@0.8.0":
|
||||
version "0.8.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue