CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-03 02:27:06 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into update-dd-trace

Browse source
This commit is contained in:
Sam Rose 2023-12-18 10:59:50 +00:00 committed by GitHub
commit f503b29e1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 8 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": "2.13.44", "version": "2.13.45",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

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 () => {

6
packages/server/src/db/linkedRows/linkUtils.ts
View file

@ -56,7 +56,7 @@ export async function getLinkDocuments(args: {
try { try {
let linkRows = (await db.query(getQueryIndex(ViewName.LINK), params)).rows let linkRows = (await db.query(getQueryIndex(ViewName.LINK), params)).rows
// filter to get unique entries // filter to get unique entries
const foundIds: string[] = [] const foundIds = new Set()
linkRows = linkRows.filter(link => { linkRows = linkRows.filter(link => {
// make sure anything unique is the correct key // make sure anything unique is the correct key
if ( if (
@ -65,9 +65,9 @@ export async function getLinkDocuments(args: {
) { ) {
return false return false
} }
const unique = foundIds.indexOf(link.id) === -1 const unique = !foundIds.has(link.id)
if (unique) { if (unique) {
foundIds.push(link.id) foundIds.add(link.id)
} }
return unique return unique
}) })