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

Merge branch 'master' into optimise-get-link-documents

This commit is contained in:
Sam Rose 2023-12-18 09:31:12 +00:00 committed by GitHub
parent c5fa0806c8 b0ef1cad76
commit d848b0559d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
View File

@ -257,7 +257,7 @@
<LockedFeature <LockedFeature
title={"Audit Logs"} title={"Audit Logs"}
planType={"Business plan"} planType={"Enterprise plan"}
description={"View all events that have occurred in your Budibase installation"} description={"View all events that have occurred in your Budibase installation"}
enabled={$licensing.auditLogsEnabled} enabled={$licensing.auditLogsEnabled}
upgradeButtonClick={async () => { upgradeButtonClick={async () => {

10
packages/builder/src/pages/builder/portal/account/usage.svelte
View File

@ -15,6 +15,7 @@
import { DashCard, Usage } from "components/usage" import { DashCard, Usage } from "components/usage"
import { PlanModel } from "constants" import { PlanModel } from "constants"
import { sdk } from "@budibase/shared-core" import { sdk } from "@budibase/shared-core"
import { PlanType } from "@budibase/types"
let staticUsage = [] let staticUsage = []
let monthlyUsage = [] let monthlyUsage = []
@ -106,7 +107,14 @@
} }
const planTitle = () => { const planTitle = () => {
return `${capitalise(license?.plan.type)} Plan` const planType = license?.plan.type
let planName = license?.plan.type
if (planType === PlanType.PREMIUM_PLUS) {
planName = "Premium"
} else if (planType === PlanType.ENTERPRISE_BASIC) {
planName = "Enterprise"
}
return `${capitalise(planName)} Plan`
} }
const getDaysRemaining = timestamp => { const getDaysRemaining = timestamp => {

2
packages/builder/src/pages/builder/portal/settings/auth/index.svelte
View File

@ -283,7 +283,7 @@
</div> </div>
{#if !$licensing.enforceableSSO} {#if !$licensing.enforceableSSO}
<Tags> <Tags>
<Tag icon="LockClosed">Enterprise</Tag> <Tag icon="LockClosed">Enterprise plan</Tag>
</Tags> </Tags>
{/if} {/if}
</div> </div>

2
packages/builder/src/pages/builder/portal/settings/environment/index.svelte
View File

@ -59,7 +59,7 @@
<LockedFeature <LockedFeature
title={"Environment Variables"} title={"Environment Variables"}
planType={"Business plan"} planType={"Enterprise plan"}
description={"Add and manage environment variables for development and production"} description={"Add and manage environment variables for development and production"}
enabled={$licensing.environmentVariablesEnabled} enabled={$licensing.environmentVariablesEnabled}
upgradeButtonClick={async () => { upgradeButtonClick={async () => {