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

Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration

This commit is contained in:
Andrew Kingston 2023-03-28 15:47:53 +01:00
parent 66de32dfb9 945c358029
commit e0e5ca7a3c
190 changed files with 3628 additions and 3305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug, linear
labels: bug
assignees: ''
---

4
.github/workflows/budibase_ci.yml vendored
View File

@ -56,11 +56,11 @@ jobs:
run: yarn install:pro $BRANCH $BASE_BRANCH
- run: yarn
- run: yarn bootstrap
- run: yarn build:client
- run: yarn test
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
files: ./packages/server/coverage/clover.xml,./packages/worker/coverage/clover.xml,./packages/backend-core/coverage/clover.xml
name: codecov-umbrella
verbose: true

23
.github/workflows/deploy-preprod.yml vendored
View File

@ -1,6 +1,10 @@
name: "deploy-preprod"
on:
workflow_dispatch:
inputs:
version:
description: Budibase release version. For example - 1.0.0
required: false
workflow_call:
jobs:
@ -8,10 +12,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: 'Get Previous tag'
id: previoustag
uses: "WyriHaximus/github-action-get-previous-tag@v1"
- name: Get the latest budibase release version
id: version
run: |
if [ -z "${{ github.event.inputs.version }}" ]; then
release_version=$(cat lerna.json | jq -r '.version')
else
release_version=${{ github.event.inputs.version }}
fi
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
@ -26,7 +36,6 @@ jobs:
-o values.preprod.yaml \
-L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
wc -l values.preprod.yaml
- name: Deploy to Preprod Environment
uses: budibase/helm@v1.8.0
with:
@ -37,7 +46,7 @@ jobs:
helm: helm3
values: |
globals:
appVersion: ${{ steps.previoustag.outputs.tag }}
appVersion: v${{ env.RELEASE_VERSION }}
ingress:
enabled: true
nginx: true
@ -52,5 +61,5 @@ jobs:
uses: tsickert/discord-webhook@v4.0.0
with:
webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod."
embed-title: ${{ steps.previoustag.outputs.tag }}
content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod."
embed-title: ${{ env.RELEASE_VERSION }}

21
.github/workflows/release-master.yml vendored
View File

@ -91,9 +91,11 @@ jobs:
uses: azure/setup-helm@v1
id: helm-install
- name: 'Get Previous tag'
id: previoustag
uses: "WyriHaximus/github-action-get-previous-tag@v1"
- name: Get the latest budibase release version
id: version
run: |
release_version=$(cat lerna.json | jq -r '.version')
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
# due to helm repo index issue: https://github.com/helm/helm/issues/7363
# we need to create new package in a different dir, merge the index and move the package back
@ -116,8 +118,6 @@ jobs:
git add -A
git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
git push
env:
RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
deploy-to-legacy-preprod-env:
needs: [release-images]
@ -130,13 +130,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: 'Get Previous tag'
id: previoustag
uses: "WyriHaximus/github-action-get-previous-tag@v1"
- name: Get the latest budibase release version
id: version
run: |
release_version=$(cat lerna.json | jq -r '.version')
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
- uses: passeidireto/trigger-external-workflow-action@main
env:
PAYLOAD_VERSION: ${{ steps.previoustag.outputs.tag }}
PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
with:
repository: budibase/budibase-deploys
event: budicloud-preprod-deploy

15
charts/budibase/templates/app-service-deployment.yaml
View File

@ -62,16 +62,22 @@ spec:
{{ end }}
- name: ENABLE_ANALYTICS
value: {{ .Values.globals.enableAnalytics | quote }}
- name: API_ENCRYPTION_KEY
value: {{ .Values.globals.apiEncryptionKey | quote }}
- name: INTERNAL_API_KEY
valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: internalApiKey
- name: INTERNAL_API_KEY_FALLBACK
value: {{ .Values.globals.internalApiKeyFallback | quote }}
- name: JWT_SECRET
valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: jwtSecret
- name: JWT_SECRET_FALLBACK
value: {{ .Values.globals.jwtSecretFallback | quote }}
{{ if .Values.services.objectStore.region }}
- name: AWS_REGION
value: {{ .Values.services.objectStore.region }}
@ -125,9 +131,9 @@ spec:
- name: SELF_HOSTED
value: {{ .Values.globals.selfHosted | quote }}
- name: SENTRY_DSN
value: {{ .Values.globals.sentryDSN }}
value: {{ .Values.globals.sentryDSN | quote }}
- name: POSTHOG_TOKEN
value: {{ .Values.globals.posthogToken }}
value: {{ .Values.globals.posthogToken | quote }}
- name: WORKER_URL
value: http://worker-service:{{ .Values.services.worker.port }}
- name: PLATFORM_URL
@ -198,8 +204,6 @@ spec:
- name: GLOBAL_AGENT_NO_PROXY
value: {{ .Values.globals.globalAgentNoProxy | quote }}
{{ end }}
- name: CDN_URL
value: {{ .Values.globals.cdnUrl }}
{{ if .Values.services.tlsRejectUnauthorized }}
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: {{ .Values.services.tlsRejectUnauthorized }}
@ -228,6 +232,9 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
{{ if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

3
charts/budibase/templates/couchdb-backup.yaml
View File

@ -50,5 +50,8 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
status: {}
{{- end }}

3
charts/budibase/templates/minio-service-deployment.yaml
View File

@ -72,6 +72,9 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
{{ if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

3
charts/budibase/templates/proxy-service-deployment.yaml
View File

@ -78,6 +78,9 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
{{ if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

3
charts/budibase/templates/redis-service-deployment.yaml
View File

@ -50,6 +50,9 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
{{ if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

11
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -62,16 +62,22 @@ spec:
{{ else }}
value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
{{ end }}
- name: API_ENCRYPTION_KEY
value: {{ .Values.globals.apiEncryptionKey | quote }}
- name: INTERNAL_API_KEY
valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: internalApiKey
- name: INTERNAL_API_KEY_FALLBACK
value: {{ .Values.globals.internalApiKeyFallback | quote }}
- name: JWT_SECRET
valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: jwtSecret
- name: JWT_SECRET_FALLBACK
value: {{ .Values.globals.jwtSecretFallback | quote }}
{{ if .Values.services.objectStore.region }}
- name: AWS_REGION
value: {{ .Values.services.objectStore.region }}
@ -188,8 +194,6 @@ spec:
- name: GLOBAL_AGENT_NO_PROXY
value: {{ .Values.globals.globalAgentNoProxy | quote }}
{{ end }}
- name: CDN_URL
value: {{ .Values.globals.cdnUrl }}
{{ if .Values.services.tlsRejectUnauthorized }}
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: {{ .Values.services.tlsRejectUnauthorized }}
@ -218,6 +222,9 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ if .Values.schedulerName }}
schedulerName: {{ .Values.schedulerName | quote }}
{{ end }}
{{ if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

4
charts/budibase/values.yaml
View File

@ -96,9 +96,13 @@ globals:
createSecrets: true # creates an internal API key, JWT secrets and redis password for you
# if createSecrets is set to false, you can hard-code your secrets here
apiEncryptionKey: ""
internalApiKey: ""
jwtSecret: ""
cdnUrl: ""
# fallback values used during live rotation
internalApiKeyFallback: ""
jwtSecretFallback: ""
smtp:
enabled: false

1
hosting/.env
View File

@ -3,6 +3,7 @@ MAIN_PORT=10000
# This section contains all secrets pertaining to the system
# These should be updated
API_ENCRYPTION_KEY=testsecret
JWT_SECRET=testsecret
MINIO_ACCESS_KEY=budibase
MINIO_SECRET_KEY=budibase

2
hosting/docker-compose.yaml
View File

@ -17,6 +17,7 @@ services:
INTERNAL_API_KEY: ${INTERNAL_API_KEY}
BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT}
PORT: 4002
API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY}
JWT_SECRET: ${JWT_SECRET}
LOG_LEVEL: info
SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131
@ -40,6 +41,7 @@ services:
SELF_HOSTED: 1
PORT: 4003
CLUSTER_PORT: ${MAIN_PORT}
API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY}
JWT_SECRET: ${JWT_SECRET}
MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}

1
hosting/hosting.properties
View File

@ -3,6 +3,7 @@ MAIN_PORT=10000
# This section contains all secrets pertaining to the system
# These should be updated
API_ENCRYPTION_KEY=testsecret
JWT_SECRET=testsecret
MINIO_ACCESS_KEY=budibase
MINIO_SECRET_KEY=budibase

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"npmClient": "yarn",
"packages": [
"packages/*"

1
package.json
View File

@ -25,6 +25,7 @@
"setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
"bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
"build": "lerna run build",
"build:client": "lerna run build --ignore @budibase/backend-core --ignore @budibase/worker --ignore @budibase/server --ignore @budibase/builder --ignore @budibase/cli --ignore @budibase/sdk",
"build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
"build:backend": "lerna run build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
"build:sdk": "lerna run build:sdk",

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
"dependencies": {
"@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.4.12-alpha.3",
"@budibase/types": "2.4.27-alpha.9",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0",

6
packages/backend-core/scripts/test.sh
View File

@ -3,10 +3,10 @@
if [[ -n $CI ]]
then
# --runInBand performs better in ci where resources are limited
echo "jest --coverage --runInBand"
jest --coverage --runInBand
echo "jest --coverage --runInBand --forceExit"
jest --coverage --runInBand --forceExit
else
# --maxWorkers performs better in development
echo "jest --coverage"
jest --coverage
fi
fi

24
packages/backend-core/src/auth/auth.ts
View File

@ -1,6 +1,5 @@
const _passport = require("koa-passport")
const LocalStrategy = require("passport-local").Strategy
const JwtStrategy = require("passport-jwt").Strategy
import { getGlobalDB } from "../context"
import { Cookie } from "../constants"
import { getSessionsForUser, invalidateSessions } from "../security/sessions"
@ -8,7 +7,6 @@ import {
authenticated,
csrf,
google,
jwt as jwtPassport,
local,
oidc,
tenancy,
@ -21,14 +19,11 @@ import {
OIDCInnerConfig,
PlatformLogoutOpts,
SSOProviderType,
User,
} from "@budibase/types"
import { logAlert } from "../logging"
import * as events from "../events"
import * as configs from "../configs"
import { clearCookie, getCookie } from "../utils"
import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
import env from "../environment"
const refresh = require("passport-oauth2-refresh")
export {
@ -51,25 +46,6 @@ export const jwt = require("jsonwebtoken")
// Strategies
_passport.use(new LocalStrategy(local.options, local.authenticate))
if (jwtPassport.options.secretOrKey) {
_passport.use(new JwtStrategy(jwtPassport.options, jwtPassport.authenticate))
} else if (!env.DISABLE_JWT_WARNING) {
logAlert("No JWT Secret supplied, cannot configure JWT strategy")
}
_passport.serializeUser((user: User, done: any) => done(null, user))
_passport.deserializeUser(async (user: User, done: any) => {
const db = getGlobalDB()
try {
const dbUser = await db.get(user._id)
return done(null, dbUser)
} catch (err) {
console.error(`User not found`, err)
return done(null, false, { message: "User not found" })
}
})
async function refreshOIDCAccessToken(
chosenConfig: OIDCInnerConfig,

65
packages/backend-core/src/db/lucene.ts
View File

@ -199,6 +199,10 @@ export class QueryBuilder<T> {
return this
}
setAllOr() {
this.query.allOr = true
}
handleSpaces(input: string) {
if (this.noEscaping) {
return input
@ -236,6 +240,36 @@ export class QueryBuilder<T> {
return value
}
isMultiCondition() {
let count = 0
for (let filters of Object.values(this.query)) {
// not contains is one massive filter in allOr mode
if (typeof filters === "object") {
count += Object.keys(filters).length
}
}
return count > 1
}
compressFilters(filters: Record<string, string[]>) {
const compressed: typeof filters = {}
for (let key of Object.keys(filters)) {
const finalKey = removeKeyNumbering(key)
if (compressed[finalKey]) {
compressed[finalKey] = compressed[finalKey].concat(filters[key])
} else {
compressed[finalKey] = filters[key]
}
}
// add prefixes back
const final: typeof filters = {}
let count = 1
for (let [key, value] of Object.entries(compressed)) {
final[`${count++}:${key}`] = value
}
return final
}
buildSearchQuery() {
const builder = this
let allOr = this.query && this.query.allOr
@ -272,9 +306,9 @@ export class QueryBuilder<T> {
}
const notContains = (key: string, value: any) => {
// @ts-ignore
const allPrefix = allOr === "" ? "*:* AND" : ""
return allPrefix + "NOT " + contains(key, value)
const allPrefix = allOr ? "*:* AND " : ""
const mode = allOr ? "AND" : undefined
return allPrefix + "NOT " + contains(key, value, mode)
}
const containsAny = (key: string, value: any) => {
@ -299,21 +333,32 @@ export class QueryBuilder<T> {
return `${key}:(${orStatement})`
}
function build(structure: any, queryFn: any) {
function build(
structure: any,
queryFn: (key: string, value: any) => string | null,
opts?: { returnBuilt?: boolean; mode?: string }
) {
let built = ""
for (let [key, value] of Object.entries(structure)) {
// check for new format - remove numbering if needed
key = removeKeyNumbering(key)
key = builder.preprocess(builder.handleSpaces(key), {
escape: true,
})
const expression = queryFn(key, value)
let expression = queryFn(key, value)
if (expression == null) {
continue
}
if (query.length > 0) {
query += ` ${allOr ? "OR" : "AND"} `
if (built.length > 0 || query.length > 0) {
const mode = opts?.mode ? opts.mode : allOr ? "OR" : "AND"
built += ` ${mode} `
}
query += expression
built += expression
}
if (opts?.returnBuilt) {
return built
} else {
query += built
}
}
@ -384,14 +429,14 @@ export class QueryBuilder<T> {
build(this.query.contains, contains)
}
if (this.query.notContains) {
build(this.query.notContains, notContains)
build(this.compressFilters(this.query.notContains), notContains)
}
if (this.query.containsAny) {
build(this.query.containsAny, containsAny)
}
// make sure table ID is always added as an AND
if (tableId) {
query = `(${query})`
query = this.isMultiCondition() ? `(${query})` : query
allOr = false
build({ tableId }, equal)
}

28
packages/backend-core/src/db/tests/lucene.spec.ts
View File

@ -6,9 +6,13 @@ import { QueryBuilder, paginatedSearch, fullSearch } from "../lucene"
const INDEX_NAME = "main"
const index = `function(doc) {
let props = ["property", "number"]
let props = ["property", "number", "array"]
for (let key of props) {
if (doc[key]) {
if (Array.isArray(doc[key])) {
for (let val of doc[key]) {
index(key, val)
}
} else if (doc[key]) {
index(key, doc[key])
}
}
@ -21,9 +25,14 @@ describe("lucene", () => {
dbName = `db-${newid()}`
// create the DB for testing
db = getDB(dbName)
await db.put({ _id: newid(), property: "word" })
await db.put({ _id: newid(), property: "word2" })
await db.put({ _id: newid(), property: "word3", number: 1 })
await db.put({ _id: newid(), property: "word", array: ["1", "4"] })
await db.put({ _id: newid(), property: "word2", array: ["3", "1"] })
await db.put({
_id: newid(),
property: "word3",
number: 1,
array: ["1", "2"],
})
})
it("should be able to create a lucene index", async () => {
@ -118,6 +127,15 @@ describe("lucene", () => {
const resp = await builder.run()
expect(resp.rows.length).toBe(2)
})
it("should be able to perform an or not contains search", async () => {
const builder = new QueryBuilder(dbName, INDEX_NAME)
builder.addNotContains("array", ["1"])
builder.addNotContains("array", ["2"])
builder.setAllOr()
const resp = await builder.run()
expect(resp.rows.length).toBe(2)
})
})
describe("paginated search", () => {

9
packages/backend-core/src/environment.ts
View File

@ -30,6 +30,12 @@ const DefaultBucketName = {
const selfHosted = !!parseInt(process.env.SELF_HOSTED || "")
function getAPIEncryptionKey() {
return process.env.API_ENCRYPTION_KEY
? process.env.API_ENCRYPTION_KEY
: process.env.JWT_SECRET // fallback to the JWT_SECRET used historically
}
const environment = {
isTest,
isJest,
@ -39,7 +45,9 @@ const environment = {
},
JS_BCRYPT: process.env.JS_BCRYPT,
JWT_SECRET: process.env.JWT_SECRET,
JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,
ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
@ -55,6 +63,7 @@ const environment = {
MINIO_URL: process.env.MINIO_URL,
MINIO_ENABLED: process.env.MINIO_ENABLED || 1,
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK,
MULTI_TENANCY: process.env.MULTI_TENANCY,
ACCOUNT_PORTAL_URL:
process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app",

10
packages/backend-core/src/errors/base.ts
View File

@ -1,10 +0,0 @@
export class BudibaseError extends Error {
code: string
type: string
constructor(message: string, code: string, type: string) {
super(message)
this.code = code
this.type = type
}
}

90
packages/backend-core/src/errors/errors.ts
View File

@ -1,37 +1,99 @@
import * as licensing from "./licensing"
// BASE
// combine all error codes into single object
export abstract class BudibaseError extends Error {
code: string
export const codes = {
...licensing.codes,
constructor(message: string, code: ErrorCode) {
super(message)
this.code = code
}
protected getPublicError?(): any
}
// combine all error types
export const types = [licensing.type]
// ERROR HANDLING
// combine all error contexts
const context = {
...licensing.context,
export enum ErrorCode {
USAGE_LIMIT_EXCEEDED = "usage_limit_exceeded",
FEATURE_DISABLED = "feature_disabled",
INVALID_API_KEY = "invalid_api_key",
HTTP = "http",
}
// derive a public error message using codes, types and any custom contexts
/**
* For the given error, build the public representation that is safe
* to be exposed over an api.
*/
export const getPublicError = (err: any) => {
let error
if (err.code || err.type) {
if (err.code) {
// add generic error information
error = {
code: err.code,
type: err.type,
}
if (err.code && context[err.code]) {
if (err.getPublicError) {
error = {
...error,
// get any additional context from this error
...context[err.code](err),
...err.getPublicError(),
}
}
}
return error
}
// HTTP
export class HTTPError extends BudibaseError {
status: number
constructor(message: string, httpStatus: number, code = ErrorCode.HTTP) {
super(message, code)
this.status = httpStatus
}
}
// LICENSING
export class UsageLimitError extends HTTPError {
limitName: string
constructor(message: string, limitName: string) {
super(message, 400, ErrorCode.USAGE_LIMIT_EXCEEDED)
this.limitName = limitName
}
getPublicError() {
return {
limitName: this.limitName,
}
}
}
export class FeatureDisabledError extends HTTPError {
featureName: string
constructor(message: string, featureName: string) {
super(message, 400, ErrorCode.FEATURE_DISABLED)
this.featureName = featureName
}
getPublicError() {
return {
featureName: this.featureName,
}
}
}
// AUTH
export class InvalidAPIKeyError extends BudibaseError {
constructor() {
super(
"Invalid API key - may need re-generated, or user doesn't exist",
ErrorCode.INVALID_API_KEY
)
}
}

7
packages/backend-core/src/errors/generic.ts
View File

@ -1,7 +0,0 @@
import { BudibaseError } from "./base"
export class GenericError extends BudibaseError {
constructor(message: string, code: string, type: string) {
super(message, code, type ? type : "generic")
}
}

15
packages/backend-core/src/errors/http.ts
View File

@ -1,15 +0,0 @@
import { GenericError } from "./generic"
export class HTTPError extends GenericError {
status: number
constructor(
message: string,
httpStatus: number,
code = "http",
type = "generic"
) {
super(message, code, type)
this.status = httpStatus
}
}

2
packages/backend-core/src/errors/index.ts
View File

@ -1,3 +1 @@
export * from "./errors"
export { UsageLimitError, FeatureDisabledError } from "./licensing"
export { HTTPError } from "./http"

39
packages/backend-core/src/errors/licensing.ts
View File

@ -1,39 +0,0 @@
import { HTTPError } from "./http"
export const type = "license_error"
export const codes = {
USAGE_LIMIT_EXCEEDED: "usage_limit_exceeded",
FEATURE_DISABLED: "feature_disabled",
}
export const context = {
[codes.USAGE_LIMIT_EXCEEDED]: (err: any) => {
return {
limitName: err.limitName,
}
},
[codes.FEATURE_DISABLED]: (err: any) => {
return {
featureName: err.featureName,
}
},
}
export class UsageLimitError extends HTTPError {
limitName: string
constructor(message: string, limitName: string) {
super(message, 400, codes.USAGE_LIMIT_EXCEEDED, type)
this.limitName = limitName
}
}
export class FeatureDisabledError extends HTTPError {
featureName: string
constructor(message: string, featureName: string) {
super(message, 400, codes.FEATURE_DISABLED, type)
this.featureName = featureName
}
}

1
packages/backend-core/src/index.ts
View File

@ -24,6 +24,7 @@ export * as redis from "./redis"
export * as locks from "./redis/redlockImpl"
export * as utils from "./utils"
export * as errors from "./errors"
export * as timers from "./timers"
export { default as env } from "./environment"
export { SearchParams } from "./db"
// Add context to tenancy for backwards compatibility

41
packages/backend-core/src/middleware/authenticated.ts
View File

@ -1,5 +1,10 @@
import { Cookie, Header } from "../constants"
import { getCookie, clearCookie, openJwt } from "../utils"
import {
getCookie,
clearCookie,
openJwt,
isValidInternalAPIKey,
} from "../utils"
import { getUser } from "../cache/user"
import { getSession, updateSessionTTL } from "../security/sessions"
import { buildMatcherRegex, matches } from "./matchers"
@ -9,6 +14,7 @@ import { decrypt } from "../security/encryption"
import * as identity from "../context/identity"
import env from "../environment"
import { Ctx, EndpointMatcher } from "@budibase/types"
import { InvalidAPIKeyError, ErrorCode } from "../errors"
const ONE_MINUTE = env.SESSION_UPDATE_PERIOD
? parseInt(env.SESSION_UPDATE_PERIOD)
@ -35,28 +41,35 @@ function finalise(ctx: any, opts: FinaliseOpts = {}) {
}
async function checkApiKey(apiKey: string, populateUser?: Function) {
if (apiKey === env.INTERNAL_API_KEY) {
// check both the primary and the fallback internal api keys
// this allows for rotation
if (isValidInternalAPIKey(apiKey)) {
return { valid: true }
}
const decrypted = decrypt(apiKey)
const tenantId = decrypted.split(SEPARATOR)[0]
return doInTenant(tenantId, async () => {
const db = getGlobalDB()
// api key is encrypted in the database
const userId = (await queryGlobalView(
ViewName.BY_API_KEY,
{
key: apiKey,
},
db
)) as string
let userId
try {
const db = getGlobalDB()
// api key is encrypted in the database
userId = (await queryGlobalView(
ViewName.BY_API_KEY,
{
key: apiKey,
},
db
)) as string
} catch (err) {
userId = undefined
}
if (userId) {
return {
valid: true,
user: await getUser(userId, tenantId, populateUser),
}
} else {
throw "Invalid API key"
throw new InvalidAPIKeyError()
}
})
}
@ -157,8 +170,10 @@ export default function (
console.error(`Auth Error: ${err.message}`)
console.error(err)
// invalid token, clear the cookie
if (err && err.name === "JsonWebTokenError") {
if (err?.name === "JsonWebTokenError") {
clearCookie(ctx, Cookie.Auth)
} else if (err?.code === ErrorCode.INVALID_API_KEY) {
ctx.throw(403, err.message)
}
// allow configuring for public access
if ((opts && opts.publicAllowed) || publicEndpoint) {

1
packages/backend-core/src/middleware/index.ts
View File

@ -1,4 +1,3 @@
export * as jwt from "./passport/jwt"
export * as local from "./passport/local"
export * as google from "./passport/sso/google"
export * as oidc from "./passport/sso/oidc"

12
packages/backend-core/src/middleware/internalApi.ts
View File

@ -1,13 +1,21 @@
import env from "../environment"
import { Header } from "../constants"
import { BBContext } from "@budibase/types"
import { isValidInternalAPIKey } from "../utils"
/**
* API Key only endpoint.
*/
export default async (ctx: BBContext, next: any) => {
const apiKey = ctx.request.headers[Header.API_KEY]
if (apiKey !== env.INTERNAL_API_KEY) {
if (!apiKey) {
ctx.throw(403, "Unauthorized")
}
if (Array.isArray(apiKey)) {
ctx.throw(403, "Unauthorized")
}
if (!isValidInternalAPIKey(apiKey)) {
ctx.throw(403, "Unauthorized")
}

19
packages/backend-core/src/middleware/passport/jwt.ts
View File

@ -1,19 +0,0 @@
import { Cookie } from "../../constants"
import env from "../../environment"
import { authError } from "./utils"
import { BBContext } from "@budibase/types"
export const options = {
secretOrKey: env.JWT_SECRET,
jwtFromRequest: function (ctx: BBContext) {
return ctx.cookies.get(Cookie.Auth)
},
}
export async function authenticate(jwt: Function, done: Function) {
try {
return done(null, jwt)
} catch (err) {
return authError(done, "JWT invalid", err)
}
}

7
packages/backend-core/src/queue/queue.ts
View File

@ -4,6 +4,7 @@ import { JobQueue } from "./constants"
import InMemoryQueue from "./inMemoryQueue"
import BullQueue from "bull"
import { addListeners, StalledFn } from "./listeners"
import * as timers from "../timers"
const CLEANUP_PERIOD_MS = 60 * 1000
let QUEUES: BullQueue.Queue[] | InMemoryQueue[] = []
@ -29,8 +30,8 @@ export function createQueue<T>(
}
addListeners(queue, jobQueue, opts?.removeStalledCb)
QUEUES.push(queue)
if (!cleanupInterval) {
cleanupInterval = setInterval(cleanup, CLEANUP_PERIOD_MS)
if (!cleanupInterval && !env.isTest()) {
cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS)
// fire off an initial cleanup
cleanup().catch(err => {
console.error(`Unable to cleanup automation queue initially - ${err}`)
@ -41,7 +42,7 @@ export function createQueue<T>(
export async function shutdown() {
if (cleanupInterval) {
clearInterval(cleanupInterval)
timers.clear(cleanupInterval)
}
if (QUEUES.length) {
for (let queue of QUEUES) {

5
packages/backend-core/src/redis/redis.ts
View File

@ -8,6 +8,7 @@ import {
SEPARATOR,
SelectableDatabase,
} from "./utils"
import * as timers from "../timers"
const RETRY_PERIOD_MS = 2000
const STARTUP_TIMEOUT_MS = 5000
@ -117,9 +118,9 @@ function waitForConnection(selectDb: number = DEFAULT_SELECT_DB) {
return
}
// check if the connection is ready
const interval = setInterval(() => {
const interval = timers.set(() => {
if (CONNECTED) {
clearInterval(interval)
timers.clear(interval)
resolve("")
}
}, 500)

12
packages/backend-core/src/security/encryption.ts
View File

@ -8,7 +8,7 @@ const RANDOM_BYTES = 16
const STRETCH_LENGTH = 32
export enum SecretOption {
JWT = "jwt",
API = "api",
ENCRYPTION = "encryption",
}
@ -19,10 +19,10 @@ function getSecret(secretOption: SecretOption): string {
secret = env.ENCRYPTION_KEY
secretName = "ENCRYPTION_KEY"
break
case SecretOption.JWT:
case SecretOption.API:
default:
secret = env.JWT_SECRET
secretName = "JWT_SECRET"
secret = env.API_ENCRYPTION_KEY
secretName = "API_ENCRYPTION_KEY"
break
}
if (!secret) {
@ -37,7 +37,7 @@ function stretchString(string: string, salt: Buffer) {
export function encrypt(
input: string,
secretOption: SecretOption = SecretOption.JWT
secretOption: SecretOption = SecretOption.API
) {
const salt = crypto.randomBytes(RANDOM_BYTES)
const stretched = stretchString(getSecret(secretOption), salt)
@ -50,7 +50,7 @@ export function encrypt(
export function decrypt(
input: string,
secretOption: SecretOption = SecretOption.JWT
secretOption: SecretOption = SecretOption.API
) {
const [salt, encrypted] = input.split(SEPARATOR)
const saltBuffer = Buffer.from(salt, "hex")

1
packages/backend-core/src/timers/index.ts Normal file
View File

@ -0,0 +1 @@
export * from "./timers"

22
packages/backend-core/src/timers/timers.ts Normal file
View File

@ -0,0 +1,22 @@
let intervals: NodeJS.Timeout[] = []
export function set(callback: () => any, period: number) {
const interval = setInterval(callback, period)
intervals.push(interval)
return interval
}
export function clear(interval: NodeJS.Timeout) {
const idx = intervals.indexOf(interval)
if (idx !== -1) {
intervals.splice(idx, 1)
}
clearInterval(interval)
}
export function cleanup() {
for (let interval of intervals) {
clearInterval(interval)
}
intervals = []
}

28
packages/backend-core/src/utils/utils.ts
View File

@ -1,5 +1,4 @@
import { getAllApps, queryGlobalView } from "../db"
import { options } from "../middleware/passport/jwt"
import {
Header,
MAX_VALID_DATE,
@ -133,7 +132,30 @@ export function openJwt(token: string) {
if (!token) {
return token
}
return jwt.verify(token, options.secretOrKey)
try {
return jwt.verify(token, env.JWT_SECRET)
} catch (e) {
if (env.JWT_SECRET_FALLBACK) {
// fallback to enable rotation
return jwt.verify(token, env.JWT_SECRET_FALLBACK)
} else {
throw e
}
}
}
export function isValidInternalAPIKey(apiKey: string) {
if (env.INTERNAL_API_KEY && env.INTERNAL_API_KEY === apiKey) {
return true
}
// fallback to enable rotation
if (
env.INTERNAL_API_KEY_FALLBACK &&
env.INTERNAL_API_KEY_FALLBACK === apiKey
) {
return true
}
return false
}
/**
@ -165,7 +187,7 @@ export function setCookie(
opts = { sign: true }
) {
if (value && opts && opts.sign) {
value = jwt.sign(value, options.secretOrKey)
value = jwt.sign(value, env.JWT_SECRET)
}
const config: SetOption = {

1
packages/backend-core/tests/jestEnv.ts
View File

@ -4,3 +4,4 @@ process.env.NODE_ENV = "jest"
process.env.MOCK_REDIS = "1"
process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
process.env.ENABLE_4XX_HTTP_LOGGING = "0"
process.env.REDIS_PASSWORD = "budibase"

5
packages/backend-core/tests/jestSetup.ts
View File

@ -1,5 +1,6 @@
import "./logging"
import env from "../src/environment"
import { cleanup } from "../src/timers"
import { mocks, testContainerUtils } from "./utilities"
// must explicitly enable fetch mock
@ -21,3 +22,7 @@ if (!process.env.CI) {
}
testContainerUtils.setupEnv(env)
afterAll(() => {
cleanup()
})

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.4.12-alpha.3",
"@budibase/string-templates": "2.4.12-alpha.3",
"@budibase/shared-core": "2.4.27-alpha.9",
"@budibase/string-templates": "2.4.27-alpha.9",
"@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",

115
packages/bbui/src/Form/Core/File.svelte Normal file
View File

@ -0,0 +1,115 @@
<script>
import ActionButton from "../../ActionButton/ActionButton.svelte"
import { uuid } from "../../helpers"
import Icon from "../../Icon/Icon.svelte"
import { createEventDispatcher } from "svelte"
export let value = null
export let title = "Upload file"
export let disabled = false
export let allowClear = null
export let extensions = null
export let handleFileTooLarge = null
export let fileSizeLimit = BYTES_IN_MB * 20
export let id = null
export let previewUrl = null
const fieldId = id || uuid()
const BYTES_IN_KB = 1000
const BYTES_IN_MB = 1000000
const dispatch = createEventDispatcher()
let fileInput
$: inputAccept = Array.isArray(extensions) ? extensions.join(",") : "*"
async function processFile(targetFile) {
if (handleFileTooLarge && targetFile?.size >= fileSizeLimit) {
handleFileTooLarge(targetFile)
return
}
dispatch("change", targetFile)
}
function handleFile(evt) {
processFile(evt.target.files[0])
}
function clearFile() {
dispatch("change", null)
}
</script>
<input
id={fieldId}
{disabled}
type="file"
accept={inputAccept}
bind:this={fileInput}
on:change={handleFile}
/>
<div class="field">
{#if value}
<div class="file-view">
{#if previewUrl}
<img class="preview" alt="" src={previewUrl} />
{/if}
<div class="filename">{value.name}</div>
{#if value.size}
<div class="filesize">
{#if value.size <= BYTES_IN_MB}
{`${value.size / BYTES_IN_KB} KB`}
{:else}
{`${value.size / BYTES_IN_MB} MB`}
{/if}
</div>
{/if}
{#if !disabled || (allowClear === true && disabled)}
<div class="delete-button" on:click={clearFile}>
<Icon name="Close" size="XS" />
</div>
{/if}
</div>
{/if}
<ActionButton {disabled} on:click={fileInput.click()}>{title}</ActionButton>
</div>
<style>
.field {
display: flex;
gap: var(--spacing-m);
}
.file-view {
display: flex;
gap: var(--spacing-l);
align-items: center;
border: 1px solid var(--spectrum-alias-border-color);
border-radius: var(--spectrum-global-dimension-size-50);
padding: 0px var(--spectrum-alias-item-padding-m);
}
input[type="file"] {
display: none;
}
.delete-button {
transition: all 0.3s;
margin-left: 10px;
display: flex;
}
.delete-button:hover {
cursor: pointer;
color: var(--red);
}
.filesize {
white-space: nowrap;
}
.filename {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.preview {
height: 1.5em;
}
</style>

1
packages/bbui/src/Form/Core/index.js
View File

@ -13,3 +13,4 @@ export { default as CoreDropzone } from "./Dropzone.svelte"
export { default as CoreStepper } from "./Stepper.svelte"
export { default as CoreRichTextField } from "./RichTextField.svelte"
export { default as CoreSlider } from "./Slider.svelte"
export { default as CoreFile } from "./File.svelte"

37
packages/bbui/src/Form/File.svelte Normal file
View File

@ -0,0 +1,37 @@
<script>
import Field from "./Field.svelte"
import { CoreFile } from "./Core"
import { createEventDispatcher } from "svelte"
export let label = null
export let labelPosition = "above"
export let disabled = false
export let allowClear = null
export let handleFileTooLarge = () => {}
export let previewUrl = null
export let extensions = null
export let error = null
export let title = null
export let value = null
export let tooltip = null
const dispatch = createEventDispatcher()
const onChange = e => {
value = e.detail
dispatch("change", e.detail)
}
</script>
<Field {label} {labelPosition} {error} {tooltip}>
<CoreFile
{error}
{disabled}
{allowClear}
{title}
{value}
{previewUrl}
{handleFileTooLarge}
{extensions}
on:change={onChange}
/>
</Field>

56
packages/bbui/src/Skeleton/Skeleton.svelte
View File

@ -1,56 +0,0 @@
<div class="skeleton">
<div class="children">
<slot />
</div>
</div>
<style>
.skeleton {
height: 100%;
width: 100%;
opacity: 0;
background-color: var(--spectrum-global-color-gray-200) !important;
border-radius: 7px;
overflow: hidden;
position: relative;
animation: fadeIn 130ms ease 0s 1 normal forwards;
}
.children {
pointer-events: none;
opacity: 0;
}
.skeleton::after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
transform: translateX(-100%);
background-image: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0,
rgba(255, 255, 255, 0.15) 20%,
rgba(255, 255, 255, 0.3) 60%,
rgba(255, 255, 255, 0)
);
animation: shimmer 2s infinite;
content: "";
}
@keyframes fadeIn {
0% {
opacity: 0;
}
100% {
opacity: 0.75;
}
}
@keyframes shimmer {
100% {
transform: translateX(100%);
}
}
</style>

2
packages/bbui/src/index.js
View File

@ -4,7 +4,6 @@ import "./bbui.css"
import "@spectrum-css/icon/dist/index-vars.css"
// Components
export { default as Skeleton } from "./Skeleton/Skeleton.svelte"
export { default as Input } from "./Form/Input.svelte"
export { default as Stepper } from "./Form/Stepper.svelte"
export { default as TextArea } from "./Form/TextArea.svelte"
@ -78,6 +77,7 @@ export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte"
export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte"
export { default as Slider } from "./Form/Slider.svelte"
export { default as Accordion } from "./Accordion/Accordion.svelte"
export { default as File } from "./Form/File.svelte"
// Renderers
export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"

10
packages/builder/index.html
View File

@ -1,17 +1,17 @@
<!doctype html>
<html class="spectrum spectrum--medium spectrum--darkest" lang="en" dir="ltr">
<head>
<meta charset='utf8'>
<meta name='viewport' content='width=device-width'>
<title>Budibase</title>
<link rel='icon' href='/src/favicon.png'>
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
rel="stylesheet" />
</head>
<body id="app">
<script type="module" src='/src/main.js'></script>
</body>
</html>

12
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -58,11 +58,11 @@
}
},
"dependencies": {
"@budibase/bbui": "2.4.12-alpha.3",
"@budibase/client": "2.4.12-alpha.3",
"@budibase/frontend-core": "2.4.12-alpha.3",
"@budibase/shared-core": "2.4.12-alpha.3",
"@budibase/string-templates": "2.4.12-alpha.3",
"@budibase/bbui": "2.4.27-alpha.9",
"@budibase/client": "2.4.27-alpha.9",
"@budibase/frontend-core": "2.4.27-alpha.9",
"@budibase/shared-core": "2.4.27-alpha.9",
"@budibase/string-templates": "2.4.27-alpha.9",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",

9
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -308,7 +308,7 @@
{ name: "Auto Column", type: AUTO_TYPE },
]
} else {
return [
let fields = [
FIELDS.STRING,
FIELDS.BARCODEQR,
FIELDS.LONGFORM,
@ -316,10 +316,13 @@
FIELDS.DATETIME,
FIELDS.NUMBER,
FIELDS.BOOLEAN,
FIELDS.ARRAY,
FIELDS.FORMULA,
FIELDS.LINK,
]
// no-sql or a spreadsheet
if (!external || table.sql) {
fields = [...fields, FIELDS.LINK, FIELDS.ARRAY]
}
return fields
}
}

4
packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte
View File

@ -35,7 +35,9 @@
await datasources.fetch()
$goto(`../../table/${table._id}`)
} catch (error) {
notifications.error("Error saving table")
notifications.error(
`Error saving table - ${error?.message || "unknown error"}`
)
}
}
</script>

12
packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
View File

@ -74,6 +74,14 @@
}
return capitalise(name)
}
function getDisplayError(error, configKey) {
return error?.replace(
new RegExp(`${configKey}`, "i"),
getDisplayName(configKey)
)
}
function getFieldGroupKeys(fieldGroup) {
return Object.entries(schema[fieldGroup].fields || {})
.filter(el => filter(el))
@ -147,7 +155,7 @@
type={schema[configKey].type}
on:change
bind:value={config[configKey]}
error={$validation.errors[configKey]}
error={getDisplayError($validation.errors[configKey], configKey)}
/>
</div>
{:else if schema[configKey].type === "fieldGroup"}
@ -180,7 +188,7 @@
type={configKey === "port" ? "string" : schema[configKey].type}
on:change
bind:value={config[configKey]}
error={$validation.errors[configKey]}
error={getDisplayError($validation.errors[configKey], configKey)}
environmentVariablesEnabled={$licensing.environmentVariablesEnabled}
{handleUpgradePanel}
/>

32
packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
View File

@ -1,15 +1,22 @@
<script>
import { ModalContent, Body, Layout } from "@budibase/bbui"
import { ModalContent, Body, Layout, Link } from "@budibase/bbui"
import { IntegrationNames } from "constants/backend"
import cloneDeep from "lodash/cloneDeepWith"
import GoogleButton from "../_components/GoogleButton.svelte"
import { saveDatasource as save } from "builderStore/datasource"
import { organisation } from "stores/portal"
import { onMount } from "svelte"
export let integration
export let modal
// kill the reference so the input isn't saved
let datasource = cloneDeep(integration)
$: isGoogleConfigured = !!$organisation.google
onMount(async () => {
await organisation.init()
})
</script>
<ModalContent
@ -18,12 +25,21 @@
cancelText="Back"
size="L"
>
<Layout noPadding>
<Body size="XS"
>Authenticate with your google account to use the {IntegrationNames[
datasource.type
]} integration.</Body
<!-- check true and false directly, don't render until flag is set -->
{#if isGoogleConfigured === true}
<Layout noPadding>
<Body size="S"
>Authenticate with your google account to use the {IntegrationNames[
datasource.type
]} integration.</Body
>
</Layout>
<GoogleButton preAuthStep={() => save(datasource, true)} />
{:else if isGoogleConfigured === false}
<Body size="S"
>Google authentication is not enabled, please complete Google SSO
configuration.</Body
>
</Layout>
<GoogleButton preAuthStep={() => save(datasource, true)} />
<Link href="/builder/portal/settings/auth">Configure Google SSO</Link>
{/if}
</ModalContent>

16
packages/builder/src/components/portal/onboarding/TourPopover.svelte
View File

@ -15,20 +15,12 @@
$: tourKey = $store.tourKey
$: tourStepKey = $store.tourStepKey
const initTour = targetKey => {
if (!targetKey) {
const updateTourStep = (targetStepKey, tourKey) => {
if (!tourKey) {
return
}
tourSteps = [...TOURS[targetKey]]
tourStepIdx = 0
tourStep = { ...tourSteps[tourStepIdx] }
}
$: initTour(tourKey)
const updateTourStep = targetStepKey => {
if (!tourSteps?.length) {
return
tourSteps = [...TOURS[tourKey]]
}
tourStepIdx = getCurrentStepIdx(tourSteps, targetStepKey)
lastStep = tourStepIdx + 1 == tourSteps.length
@ -36,7 +28,7 @@
tourStep.onLoad()
}
$: updateTourStep(tourStepKey)
$: updateTourStep(tourStepKey, tourKey)
const showPopover = (tourStep, tourNodes, popover) => {
if (!tourStep) {

26
packages/builder/src/components/portal/onboarding/TourWrap.svelte
View File

@ -8,20 +8,28 @@
let currentTourStep
let ready = false
let registered = false
let handler
const registerTourNode = (tourKey, stepKey) => {
if (ready && !registered && tourKey) {
currentTourStep = TOURS[tourKey].find(step => step.id === stepKey)
if (!currentTourStep) {
return
}
const elem = document.querySelector(currentTourStep.query)
handler = tourHandler(elem, stepKey)
registered = true
}
}
$: tourKeyWatch = $store.tourKey
$: registerTourNode(tourKeyWatch, tourStepKey, ready)
onMount(() => {
if (!$store.tourKey) return
currentTourStep = TOURS[$store.tourKey].find(
step => step.id === tourStepKey
)
if (!currentTourStep) return
const elem = document.querySelector(currentTourStep.query)
handler = tourHandler(elem, tourStepKey)
ready = true
})
onDestroy(() => {
if (handler) {
handler.destroy()

32
packages/builder/src/pages/builder/Branding.svelte Normal file
View File

@ -0,0 +1,32 @@
<script>
import { organisation, auth } from "stores/portal"
import { onMount } from "svelte"
let loaded = false
$: platformTitleText = $organisation.platformTitle
$: platformTitle =
!$auth.user && platformTitleText ? platformTitleText : "Budibase"
$: faviconUrl = $organisation.faviconUrl || "https://i.imgur.com/Xhdt1YP.png"
onMount(async () => {
await organisation.init()
loaded = true
})
</script>
<!--
In order to update the org elements, an update will have to be made to clear them.
-->
<svelte:head>
<title>{platformTitle}</title>
{#if loaded && !$auth.user && faviconUrl}
<link rel="icon" href={faviconUrl} />
{:else}
<!-- A default must be set or the browser defaults to favicon.ico behaviour -->
<link rel="icon" href={"https://i.imgur.com/Xhdt1YP.png"} />
{/if}
</svelte:head>

4
packages/builder/src/pages/builder/_layout.svelte
View File

@ -4,6 +4,7 @@
import { onMount } from "svelte"
import { CookieUtils, Constants } from "@budibase/frontend-core"
import { API } from "api"
import Branding from "./Branding.svelte"
let loaded = false
@ -146,6 +147,9 @@
}
</script>
<!--Portal branding overrides -->
<Branding />
{#if loaded}
<slot />
{/if}

5
packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
View File

@ -182,12 +182,13 @@
}
const handleKeyDown = e => {
if (e.key === "Tab") {
if (e.key === "Tab" || e.key === "ArrowDown" || e.key === "ArrowUp") {
// Cycle selected components on tab press
if (selectedIndex == null) {
selectedIndex = 0
} else {
selectedIndex = (selectedIndex + 1) % componentList.length
const direction = e.key === "ArrowUp" ? -1 : 1
selectedIndex = (selectedIndex + direction) % componentList.length
}
e.preventDefault()
e.stopPropagation()

189
packages/builder/src/pages/builder/auth/login.svelte
View File

@ -30,7 +30,7 @@
async function login() {
form.validate()
if (Object.keys(errors).length > 0) {
console.log("errors")
console.log("errors", errors)
return
}
try {
@ -64,99 +64,106 @@
</script>
<svelte:window on:keydown={handleKeydown} />
<TestimonialPage>
<Layout gap="L" noPadding>
<Layout justifyItems="center" noPadding>
{#if loaded}
<img alt="logo" src={$organisation.logoUrl || Logo} />
{/if}
<Heading size="M">Log in to Budibase</Heading>
</Layout>
<Layout gap="S" noPadding>
{#if loaded && ($organisation.google || $organisation.oidc)}
<FancyForm>
<OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
<GoogleButton />
</FancyForm>
{/if}
{#if loaded}
<TestimonialPage enabled={$organisation.testimonialsEnabled}>
<Layout gap="L" noPadding>
<Layout justifyItems="center" noPadding>
{#if loaded}
<img alt="logo" src={$organisation.logoUrl || Logo} />
{/if}
<Heading size="M">
{$organisation.loginHeading || "Log in to Budibase"}
</Heading>
</Layout>
<Layout gap="S" noPadding>
{#if loaded && ($organisation.google || $organisation.oidc)}
<FancyForm>
<OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
<GoogleButton />
</FancyForm>
{/if}
{#if !$organisation.isSSOEnforced}
<Divider />
<FancyForm bind:this={form}>
<FancyInput
label="Your work email"
value={formData.username}
on:change={e => {
formData = {
...formData,
username: e.detail,
}
}}
validate={() => {
let fieldError = {
username: !formData.username
? "Please enter a valid email"
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
}}
error={errors.username}
/>
<FancyInput
label="Password"
value={formData.password}
type="password"
on:change={e => {
formData = {
...formData,
password: e.detail,
}
}}
validate={() => {
let fieldError = {
password: !formData.password
? "Please enter your password"
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
}}
error={errors.password}
/>
</FancyForm>
{/if}
</Layout>
{#if !$organisation.isSSOEnforced}
<Divider />
<FancyForm bind:this={form}>
<FancyInput
label="Your work email"
value={formData.username}
on:change={e => {
formData = {
...formData,
username: e.detail,
}
}}
validate={() => {
let fieldError = {
username: !formData.username
? "Please enter a valid email"
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
}}
error={errors.username}
/>
<FancyInput
label="Password"
value={formData.password}
type="password"
on:change={e => {
formData = {
...formData,
password: e.detail,
}
}}
validate={() => {
let fieldError = {
password: !formData.password
? "Please enter your password"
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
}}
error={errors.password}
/>
</FancyForm>
<Layout gap="XS" noPadding justifyItems="center">
<Button
size="L"
cta
disabled={Object.keys(errors).length > 0}
on:click={login}
>
{$organisation.loginButton || `Log in to ${company}`}
</Button>
</Layout>
<Layout gap="XS" noPadding justifyItems="center">
<div class="user-actions">
<ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
Forgot password?
</ActionButton>
</div>
</Layout>
{/if}
{#if cloud}
<Body size="xs" textAlign="center">
By using Budibase Cloud
<br />
you are agreeing to our
<Link
href="https://budibase.com/eula"
target="_blank"
secondary={true}
>
License Agreement
</Link>
</Body>
{/if}
</Layout>
{#if !$organisation.isSSOEnforced}
<Layout gap="XS" noPadding justifyItems="center">
<Button
size="L"
cta
disabled={Object.keys(errors).length > 0}
on:click={login}
>
Log in to {company}
</Button>
</Layout>
<Layout gap="XS" noPadding justifyItems="center">
<div class="user-actions">
<ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
Forgot password?
</ActionButton>
</div>
</Layout>
{/if}
{#if cloud}
<Body size="xs" textAlign="center">
By using Budibase Cloud
<br />
you are agreeing to our
<Link href="https://budibase.com/eula" target="_blank" secondary={true}>
License Agreement
</Link>
</Body>
{/if}
</Layout>
</TestimonialPage>
</TestimonialPage>
{/if}
<style>
.user-actions {

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

@ -47,8 +47,9 @@
$: googleCallbackTooltip = $admin.cloud
? null
: googleCallbackReadonly
? "Vist the organisation page to update the platform URL"
? "Visit the organisation page to update the platform URL"
: "Leave blank to use the default callback URL"
$: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback`
$: GoogleConfigFields = {
Google: [
@ -62,6 +63,14 @@
placeholder: $organisation.googleCallbackUrl,
copyButton: true,
},
{
name: "sheetsURL",
label: "Sheets URL",
readonly: googleCallbackReadonly,
tooltip: googleCallbackTooltip,
placeholder: googleSheetsCallbackUrl,
copyButton: true,
},
],
}
@ -396,7 +405,11 @@
</Heading>
<Body size="S">
To allow users to authenticate using their Google accounts, fill out the
fields below.
fields below. Read the <Link
size="M"
href={"https://docs.budibase.com/docs/sso-with-google"}
>documentation</Link
> for more information.
</Body>
</Layout>
<Layout gap="XS" noPadding>

446
packages/builder/src/pages/builder/portal/settings/branding.svelte Normal file
View File

@ -0,0 +1,446 @@
<script>
import {
Layout,
Heading,
Body,
Divider,
File,
notifications,
Tags,
Tag,
Button,
Toggle,
Input,
Label,
TextArea,
} from "@budibase/bbui"
import { auth, organisation, licensing, admin } from "stores/portal"
import { API } from "api"
import { onMount } from "svelte"
import { goto } from "@roxi/routify"
const imageExtensions = [
".png",
".tiff",
".gif",
".raw",
".jpg",
".jpeg",
".svg",
".bmp",
".jfif",
]
const faviconExtensions = [".png", ".ico", ".gif"]
let mounted = false
let saving = false
let logoFile = null
let logoPreview = null
let faviconFile = null
let faviconPreview = null
let config = {}
let updated = false
$: onConfigUpdate(config, mounted)
$: init = Object.keys(config).length > 0
$: isCloud = $admin.cloud
$: brandingEnabled = $licensing.brandingEnabled
const onConfigUpdate = () => {
if (!mounted || updated || !init) {
return
}
updated = true
}
$: logo = config.logoUrl
? { url: config.logoUrl, type: "image", name: "Logo" }
: null
$: favicon = config.faviconUrl
? { url: config.faviconUrl, type: "image", name: "Favicon" }
: null
const previewUrl = async localFile => {
if (!localFile) {
return Promise.resolve(null)
}
return new Promise(resolve => {
let reader = new FileReader()
try {
reader.onload = e => {
resolve({
result: e.target.result,
})
}
reader.readAsDataURL(localFile)
} catch (error) {
console.error(error)
resolve(null)
}
})
}
$: previewUrl(logoFile).then(response => {
if (response) {
logoPreview = response.result
}
})
$: previewUrl(faviconFile).then(response => {
if (response) {
faviconPreview = response.result
}
})
async function uploadLogo(file) {
let response = {}
try {
let data = new FormData()
data.append("file", file)
response = await API.uploadLogo(data)
} catch (error) {
notifications.error("Error uploading logo")
}
return response
}
async function uploadFavicon(file) {
let response = {}
try {
let data = new FormData()
data.append("file", file)
response = await API.uploadFavicon(data)
} catch (error) {
notifications.error("Error uploading favicon")
}
return response
}
async function saveConfig() {
saving = true
if (logoFile) {
const logoResp = await uploadLogo(logoFile)
if (logoResp.url) {
config = {
...config,
logoUrl: logoResp.url,
}
logoFile = null
logoPreview = null
}
}
if (faviconFile) {
const faviconResp = await uploadFavicon(faviconFile)
if (faviconResp.url) {
config = {
...config,
faviconUrl: faviconResp.url,
}
faviconFile = null
faviconPreview = null
}
}
// Trim
const userStrings = [
"metaTitle",
"platformTitle",
"loginButton",
"loginHeading",
"metaDescription",
"metaImageUrl",
]
const trimmed = userStrings.reduce((acc, fieldName) => {
acc[fieldName] = config[fieldName] ? config[fieldName].trim() : undefined
return acc
}, {})
config = {
...config,
...trimmed,
}
try {
// Update settings
await organisation.save(config)
await organisation.init()
notifications.success("Branding settings updated")
} catch (e) {
console.error("Branding updated failed", e)
notifications.error("Branding updated failed")
}
updated = false
saving = false
}
onMount(async () => {
await organisation.init()
config = {
faviconUrl: $organisation.faviconUrl,
logoUrl: $organisation.logoUrl,
platformTitle: $organisation.platformTitle,
emailBrandingEnabled: $organisation.emailBrandingEnabled,
loginHeading: $organisation.loginHeading,
loginButton: $organisation.loginButton,
testimonialsEnabled: $organisation.testimonialsEnabled,
metaDescription: $organisation.metaDescription,
metaImageUrl: $organisation.metaImageUrl,
metaTitle: $organisation.metaTitle,
}
mounted = true
})
</script>
{#if $auth.isAdmin && mounted}
<Layout noPadding>
<Layout gap="XS" noPadding>
<div class="title">
<Heading size="M">Branding</Heading>
{#if !isCloud && !brandingEnabled}
<Tags>
<Tag icon="LockClosed">Business</Tag>
</Tags>
{/if}
{#if isCloud && !brandingEnabled}
<Tags>
<Tag icon="LockClosed">Pro</Tag>
</Tags>
{/if}
</div>
<Body>Remove all Budibase branding and use your own.</Body>
</Layout>
<Divider />
<div class="branding fields">
<div class="field">
<Label size="L">Logo</Label>
<File
title="Upload image"
handleFileTooLarge={() => {
notifications.warn("File too large. 20mb limit")
}}
extensions={imageExtensions}
previewUrl={logoPreview || logo?.url}
on:change={e => {
let clone = { ...config }
if (e.detail) {
logoFile = e.detail
logoPreview = null
} else {
logoFile = null
clone.logoUrl = ""
}
config = clone
}}
value={logoFile || logo}
disabled={!brandingEnabled || saving}
allowClear={true}
/>
</div>
<div class="field">
<Label size="L">Favicon</Label>
<File
title="Upload image"
handleFileTooLarge={() => {
notifications.warn("File too large. 20mb limit")
}}
extensions={faviconExtensions}
previewUrl={faviconPreview || favicon?.url}
on:change={e => {
let clone = { ...config }
if (e.detail) {
faviconFile = e.detail
faviconPreview = null
} else {
clone.faviconUrl = ""
}
config = clone
}}
value={faviconFile || favicon}
disabled={!brandingEnabled || saving}
allowClear={true}
/>
</div>
{#if !isCloud}
<div class="field">
<Label size="L">Title</Label>
<Input
on:change={e => {
let clone = { ...config }
clone.platformTitle = e.detail ? e.detail : ""
config = clone
}}
value={config.platformTitle || ""}
disabled={!brandingEnabled || saving}
/>
</div>
{/if}
<div>
<Toggle
text={"Remove Budibase brand from emails"}
on:change={e => {
let clone = { ...config }
clone.emailBrandingEnabled = !e.detail
config = clone
}}
value={!config.emailBrandingEnabled}
disabled={!brandingEnabled || saving}
/>
</div>
</div>
{#if !isCloud}
<Divider />
<Layout gap="XS" noPadding>
<Heading size="S">Login page</Heading>
<Body />
</Layout>
<div class="login">
<div class="fields">
<div class="field">
<Label size="L">Header</Label>
<Input
on:change={e => {
let clone = { ...config }
clone.loginHeading = e.detail ? e.detail : ""
config = clone
}}
value={config.loginHeading || ""}
disabled={!brandingEnabled || saving}
/>
</div>
<div class="field">
<Label size="L">Button</Label>
<Input
on:change={e => {
let clone = { ...config }
clone.loginButton = e.detail ? e.detail : ""
config = clone
}}
value={config.loginButton || ""}
disabled={!brandingEnabled || saving}
/>
</div>
<div>
<Toggle
text={"Remove customer testimonials"}
on:change={e => {
let clone = { ...config }
clone.testimonialsEnabled = !e.detail
config = clone
}}
value={!config.testimonialsEnabled}
disabled={!brandingEnabled || saving}
/>
</div>
</div>
</div>
{/if}
<Divider />
<Layout gap="XS" noPadding>
<Heading size="S">Application previews</Heading>
<Body>Customise the meta tags on your app preview</Body>
</Layout>
<div class="app-previews">
<div class="fields">
<div class="field">
<Label size="L">Image URL</Label>
<Input
on:change={e => {
let clone = { ...config }
clone.metaImageUrl = e.detail ? e.detail : ""
config = clone
}}
value={config.metaImageUrl}
disabled={!brandingEnabled || saving}
/>
</div>
<div class="field">
<Label size="L">Title</Label>
<Input
on:change={e => {
let clone = { ...config }
clone.metaTitle = e.detail ? e.detail : ""
config = clone
}}
value={config.metaTitle}
disabled={!brandingEnabled || saving}
/>
</div>
<div class="field">
<Label size="L">Description</Label>
<TextArea
on:change={e => {
let clone = { ...config }
clone.metaDescription = e.detail ? e.detail : ""
config = clone
}}
value={config.metaDescription}
disabled={!brandingEnabled || saving}
/>
</div>
</div>
</div>
<div class="buttons">
{#if !brandingEnabled}
<Button
on:click={() => {
if (isCloud && $auth?.user?.accountPortalAccess) {
window.open($admin.accountPortalUrl + "/portal/upgrade", "_blank")
} else if ($auth.isAdmin) {
$goto("/builder/portal/account/upgrade")
}
}}
secondary
disabled={saving}
>
Upgrade
</Button>
{/if}
<Button on:click={saveConfig} cta disabled={saving || !updated || !init}>
Save
</Button>
</div>
</Layout>
{/if}
<style>
.buttons {
display: flex;
gap: var(--spacing-m);
}
.title {
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
gap: var(--spacing-m);
}
.branding,
.login {
width: 70%;
max-width: 70%;
}
.fields {
display: grid;
grid-gap: var(--spacing-m);
}
.field {
display: grid;
grid-template-columns: 80px auto;
grid-gap: var(--spacing-l);
align-items: center;
}
</style>

49
packages/builder/src/pages/builder/portal/settings/organisation.svelte
View File

@ -7,12 +7,10 @@
Divider,
Label,
Input,
Dropzone,
notifications,
Toggle,
} from "@budibase/bbui"
import { auth, organisation, admin } from "stores/portal"
import { API } from "api"
import { writable } from "svelte/store"
import { redirect } from "@roxi/routify"
@ -28,32 +26,14 @@
company: $organisation.company,
platformUrl: $organisation.platformUrl,
analyticsEnabled: $organisation.analyticsEnabled,
logo: $organisation.logoUrl
? { url: $organisation.logoUrl, type: "image", name: "Logo" }
: null,
})
let loading = false
async function uploadLogo(file) {
try {
let data = new FormData()
data.append("file", file)
await API.uploadLogo(data)
} catch (error) {
notifications.error("Error uploading logo")
}
}
let loading = false
async function saveConfig() {
loading = true
try {
// Upload logo if required
if ($values.logo && !$values.logo.url) {
await uploadLogo($values.logo)
await organisation.init()
}
const config = {
isSSOEnforced: $values.isSSOEnforced,
company: $values.company ?? "",
@ -61,11 +41,6 @@
analyticsEnabled: $values.analyticsEnabled,
}
// Remove logo if required
if (!$values.logo) {
config.logoUrl = ""
}
// Update settings
await organisation.save(config)
} catch (error) {
@ -87,21 +62,7 @@
<Label size="L">Org. name</Label>
<Input thin bind:value={$values.company} />
</div>
<div class="field logo">
<Label size="L">Logo</Label>
<div class="file">
<Dropzone
value={[$values.logo]}
on:change={e => {
if (!e.detail || e.detail.length === 0) {
$values.logo = null
} else {
$values.logo = e.detail[0]
}
}}
/>
</div>
</div>
{#if !$admin.cloud}
<div class="field">
<Label
@ -137,10 +98,4 @@
grid-gap: var(--spacing-l);
align-items: center;
}
.file {
max-width: 30ch;
}
.logo {
align-items: start;
}
</style>

9
packages/builder/src/stores/portal/licensing.js
View File

@ -13,9 +13,11 @@ export const createLicensingStore = () => {
license: undefined,
isFreePlan: true,
isEnterprisePlan: true,
isBusinessPlan: true,
// features
groupsEnabled: false,
backupsEnabled: false,
brandingEnabled: false,
// the currently used quotas from the db
quotaUsage: undefined,
// derived quota metrics for percentages used
@ -57,6 +59,7 @@ export const createLicensingStore = () => {
const planType = license?.plan.type
const isEnterprisePlan = planType === Constants.PlanType.ENTERPRISE
const isFreePlan = planType === Constants.PlanType.FREE
const isBusinessPlan = planType === Constants.PlanType.BUSINESS
const groupsEnabled = license.features.includes(
Constants.Features.USER_GROUPS
)
@ -69,7 +72,9 @@ export const createLicensingStore = () => {
const enforceableSSO = license.features.includes(
Constants.Features.ENFORCEABLE_SSO
)
const brandingEnabled = license.features.includes(
Constants.Features.BRANDING
)
const auditLogsEnabled = license.features.includes(
Constants.Features.AUDIT_LOGS
)
@ -79,8 +84,10 @@ export const createLicensingStore = () => {
license,
isEnterprisePlan,
isFreePlan,
isBusinessPlan,
groupsEnabled,
backupsEnabled,
brandingEnabled,
environmentVariablesEnabled,
auditLogsEnabled,
enforceableSSO,

4
packages/builder/src/stores/portal/menu.js
View File

@ -50,6 +50,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
title: "Organisation",
href: "/builder/portal/settings/organisation",
},
{
title: "Branding",
href: "/builder/portal/settings/branding",
},
{
title: "Environment",
href: "/builder/portal/settings/environment",

9
packages/builder/src/stores/portal/organisation.js
View File

@ -6,6 +6,15 @@ import _ from "lodash"
const DEFAULT_CONFIG = {
platformUrl: "",
logoUrl: undefined,
faviconUrl: undefined,
emailBrandingEnabled: true,
testimonialsEnabled: true,
platformTitle: "Budibase",
loginHeading: undefined,
loginButton: undefined,
metaDescription: undefined,
metaImageUrl: undefined,
metaTitle: undefined,
docsUrl: undefined,
company: "Budibase",
oidc: undefined,

8
packages/cli/package.json
View File

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

1
packages/cli/src/hosting/makeFiles.ts
View File

@ -13,6 +13,7 @@ export const ENV_PATH = path.resolve("./.env")
function getSecrets(opts = { single: false }) {
const secrets = [
"API_ENCRYPTION_KEY",
"JWT_SECRET",
"MINIO_ACCESS_KEY",
"MINIO_SECRET_KEY",

6
packages/cli/src/hosting/update.ts
View File

@ -4,6 +4,8 @@ import {
downloadDockerCompose,
handleError,
getServices,
getServiceImage,
setServiceImage,
} from "./utils"
import { confirmation } from "../questions"
import compose from "docker-compose"
@ -23,7 +25,11 @@ export async function update() {
!isSingle &&
(await confirmation("Do you wish to update you docker-compose.yaml?"))
) {
// get current MinIO image
const image = await getServiceImage("minio")
await downloadDockerCompose()
// replace MinIO image
setServiceImage("minio", image)
}
await handleError(async () => {
const status = await compose.ps()

43
packages/cli/src/hosting/utils.ts
View File

@ -9,10 +9,44 @@ const ERROR_FILE = "docker-error.log"
const COMPOSE_URL =
"https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml"
export async function downloadDockerCompose() {
const fileName = COMPOSE_URL.split("/").slice(-1)[0]
function composeFilename() {
return COMPOSE_URL.split("/").slice(-1)[0]
}
export function getServiceImage(service: string) {
const filename = composeFilename()
try {
await downloadFile(COMPOSE_URL, `./${fileName}`)
const { services } = getServices(filename)
const serviceKey = Object.keys(services).find(name =>
name.includes(service)
)
if (serviceKey) {
return services[serviceKey].image
} else {
return null
}
} catch (err) {
return null
}
}
export function setServiceImage(service: string, image: string) {
const filename = composeFilename()
if (!fs.existsSync(filename)) {
throw new Error(
`File ${filename} not found, cannot update ${service} image.`
)
}
const current = getServiceImage(service)!
let contents = fs.readFileSync(filename, "utf8")
contents = contents.replace(`image: ${current}`, `image: ${image}`)
fs.writeFileSync(filename, contents)
}
export async function downloadDockerCompose() {
const filename = composeFilename()
try {
await downloadFile(COMPOSE_URL, `./${filename}`)
} catch (err) {
console.error(error(`Failed to retrieve compose file - ${err}`))
}
@ -49,6 +83,9 @@ export async function handleError(func: Function) {
}
export function getServices(path: string) {
if (!fs.existsSync(path)) {
throw new Error(`No yaml found at path: ${path}`)
}
const dockerYaml = fs.readFileSync(path, "utf8")
const parsedYaml = yaml.parse(dockerYaml)
return { yaml: parsedYaml, services: parsedYaml.services }

6
packages/cli/yarn.lock
View File

@ -239,9 +239,9 @@
"@hapi/hoek" "^9.0.0"
"@sideway/formula@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
version "3.0.1"
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
"@sideway/pinpoint@^2.0.0":
version "2.0.0"

347
packages/client/manifest.json
View File

@ -17,10 +17,7 @@
"description": "This component is specific only to layouts",
"icon": "Sandbox",
"hasChildren": true,
"styles": [
"padding",
"background"
],
"styles": ["padding", "background"],
"settings": [
{
"type": "text",
@ -36,23 +33,14 @@
"type": "select",
"label": "Navigation",
"key": "navigation",
"options": [
"Top",
"Left",
"None"
],
"options": ["Top", "Left", "None"],
"defaultValue": "Top"
},
{
"type": "select",
"label": "Width",
"key": "width",
"options": [
"Small",
"Medium",
"Large",
"Max"
],
"options": ["Small", "Medium", "Large", "Max"],
"defaultValue": "Large"
},
{
@ -89,13 +77,7 @@
"width": 400,
"height": 200
},
"styles": [
"padding",
"size",
"background",
"border",
"shadow"
],
"styles": ["padding", "size", "background", "border", "shadow"],
"settings": [
{
"type": "select",
@ -255,9 +237,7 @@
"description": "Add a section to your application",
"icon": "ColumnTwoB",
"hasChildren": true,
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"showEmptyState": false,
"size": {
"width": 400,
@ -376,9 +356,7 @@
"name": "Divider",
"description": "A basic divider",
"icon": "Separator",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"size": {
"width": 400,
"height": 10
@ -415,9 +393,7 @@
"name": "Repeater",
"description": "A configurable data list that attaches to your backend tables.",
"icon": "JourneyData",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"hasChildren": true,
"size": {
"width": 400,
@ -574,9 +550,7 @@
"name": "Stacked List",
"icon": "TaskList",
"description": "A basic card component that can contain content and actions.",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"settings": [
{
"type": "text",
@ -606,9 +580,7 @@
"name": "Vertical Card",
"description": "A basic card component that can contain content and actions.",
"icon": "ViewColumn",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"settings": [
{
"type": "text",
@ -652,24 +624,14 @@
"type": "select",
"label": "Image Height",
"key": "imageHeight",
"options": [
"auto",
"12rem",
"16rem",
"20rem",
"24rem"
],
"options": ["auto", "12rem", "16rem", "20rem", "24rem"],
"defaultValue": "auto"
},
{
"type": "select",
"label": "Card Width",
"key": "cardWidth",
"options": [
"16rem",
"20rem",
"24rem"
],
"options": ["16rem", "20rem", "24rem"],
"defaultValue": "20rem"
}
]
@ -678,9 +640,7 @@
"name": "Paragraph",
"description": "A component for displaying paragraph text.",
"icon": "TextParagraph",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"editable": true,
"size": {
"width": 400,
@ -803,9 +763,7 @@
"name": "Headline",
"icon": "TextBold",
"description": "A component for displaying heading text",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"editable": true,
"size": {
"width": 400,
@ -982,9 +940,7 @@
"name": "Image",
"description": "A basic component for displaying images",
"icon": "Image",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 400,
"height": 300
@ -1002,9 +958,8 @@
"name": "Background Image",
"description": "A background image",
"icon": "Images",
"styles": [
"size"
],
"hasChildren": true,
"styles": ["size"],
"size": {
"width": 400,
"height": 300
@ -1162,9 +1117,7 @@
"name": "Nav Bar",
"description": "A component for handling the navigation within your app.",
"icon": "BreadcrumbNavigation",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"hasChildren": true,
"settings": [
{
@ -1365,25 +1318,14 @@
"type": "select",
"label": "Image Width",
"key": "imageWidth",
"options": [
"auto",
"8rem",
"12rem",
"16rem"
],
"options": ["auto", "8rem", "12rem", "16rem"],
"defaultValue": "8rem"
},
{
"type": "select",
"label": "Image Height",
"key": "imageHeight",
"options": [
"auto",
"8rem",
"12rem",
"16rem",
"auto"
],
"options": ["auto", "8rem", "12rem", "16rem", "auto"],
"defaultValue": "auto"
}
]
@ -1424,9 +1366,7 @@
"name": "Embed",
"icon": "Code",
"description": "Embed content from 3rd party sources",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 400,
"height": 100
@ -1478,11 +1418,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -1640,11 +1576,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -1736,11 +1668,7 @@
"type": "select",
"label": "Curve",
"key": "curve",
"options": [
"Smooth",
"Straight",
"Stepline"
],
"options": ["Smooth", "Straight", "Stepline"],
"defaultValue": "Smooth"
},
{
@ -1801,11 +1729,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -1897,11 +1821,7 @@
"type": "select",
"label": "Curve",
"key": "curve",
"options": [
"Smooth",
"Straight",
"Stepline"
],
"options": ["Smooth", "Straight", "Stepline"],
"defaultValue": "Smooth"
},
{
@ -2253,11 +2173,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -2293,19 +2209,14 @@
"name": "Form",
"icon": "Form",
"hasChildren": true,
"illegalChildren": [
"section",
"form"
],
"illegalChildren": ["section", "form"],
"actions": [
"ValidateForm",
"ClearForm",
"ChangeFormStep",
"UpdateFieldValue"
],
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 400,
"height": 400
@ -2315,10 +2226,7 @@
"type": "select",
"label": "Type",
"key": "actionType",
"options": [
"Create",
"Update"
],
"options": ["Create", "Update"],
"defaultValue": "Create"
},
{
@ -2388,14 +2296,8 @@
"name": "Form Step",
"icon": "AssetsAdded",
"hasChildren": true,
"illegalChildren": [
"section",
"form",
"form step"
],
"styles": [
"size"
],
"illegalChildren": ["section", "form", "form step"],
"styles": ["size"],
"size": {
"width": 400,
"height": 400
@ -2413,12 +2315,8 @@
"fieldgroup": {
"name": "Field Group",
"icon": "Group",
"illegalChildren": [
"section"
],
"styles": [
"size"
],
"illegalChildren": ["section"],
"styles": ["size"],
"hasChildren": true,
"size": {
"width": 400,
@ -2448,12 +2346,9 @@
]
},
"stringfield": {
"skeleton": false,
"name": "Text Field",
"icon": "Text",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -2540,12 +2435,9 @@
]
},
"numberfield": {
"skeleton": false,
"name": "Number Field",
"icon": "123",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -2598,12 +2490,9 @@
]
},
"passwordfield": {
"skeleton": false,
"name": "Password Field",
"icon": "LockClosed",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -2656,12 +2545,9 @@
]
},
"optionsfield": {
"skeleton": false,
"name": "Options Picker",
"icon": "Menu",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -2825,12 +2711,9 @@
]
},
"multifieldselect": {
"skeleton": false,
"name": "Multi-select Picker",
"icon": "ViewList",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -2988,7 +2871,6 @@
]
},
"booleanfield": {
"skeleton": false,
"name": "Checkbox",
"icon": "SelectBox",
"editable": true,
@ -3067,12 +2949,9 @@
]
},
"longformfield": {
"skeleton": false,
"name": "Long Form Field",
"icon": "TextAlignLeft",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3147,12 +3026,9 @@
]
},
"datetimefield": {
"skeleton": false,
"name": "Date Picker",
"icon": "Date",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3229,12 +3105,9 @@
]
},
"codescanner": {
"skeleton": false,
"name": "Barcode/QR Scanner",
"icon": "Camera",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 400,
"height": 50
@ -3283,9 +3156,7 @@
"embeddedmap": {
"name": "Embedded Map",
"icon": "Location",
"styles": [
"size"
],
"styles": ["size"],
"draggable": false,
"size": {
"width": 400,
@ -3395,12 +3266,9 @@
]
},
"attachmentfield": {
"skeleton": false,
"name": "Attachment",
"icon": "Attach",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3460,12 +3328,9 @@
]
},
"relationshipfield": {
"skeleton": false,
"name": "Relationship Picker",
"icon": "TaskList",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3524,12 +3389,9 @@
]
},
"jsonfield": {
"skeleton": false,
"name": "JSON Field",
"icon": "Brackets",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3579,9 +3441,7 @@
"s3upload": {
"name": "S3 File Upload",
"icon": "UploadToCloud",
"styles": [
"size"
],
"styles": ["size"],
"editable": true,
"size": {
"width": 400,
@ -3642,13 +3502,9 @@
"dataprovider": {
"name": "Data Provider",
"icon": "Data",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"hasChildren": true,
"actions": [
"RefreshDatasource"
],
"actions": ["RefreshDatasource"],
"size": {
"width": 400,
"height": 100
@ -3674,10 +3530,7 @@
"type": "select",
"label": "Sort Order",
"key": "sortOrder",
"options": [
"Ascending",
"Descending"
],
"options": ["Ascending", "Descending"],
"defaultValue": "Ascending"
},
{
@ -3726,12 +3579,9 @@
}
},
"table": {
"skeleton": false,
"name": "Table",
"icon": "Table",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"hasChildren": true,
"showEmptyState": false,
"size": {
@ -3815,9 +3665,7 @@
"daterangepicker": {
"name": "Date Range",
"icon": "Calendar",
"styles": [
"size"
],
"styles": ["size"],
"hasChildren": false,
"size": {
"width": 200,
@ -3856,9 +3704,7 @@
"spectrumcard": {
"name": "Card",
"icon": "PersonalizationField",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 300,
"height": 120
@ -4031,10 +3877,7 @@
"type": "select",
"label": "Sort Order",
"key": "sortOrder",
"options": [
"Ascending",
"Descending"
],
"options": ["Ascending", "Descending"],
"defaultValue": "Ascending"
},
{
@ -4213,11 +4056,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -4271,11 +4110,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -4292,11 +4127,7 @@
"type": "select",
"label": "Curve",
"key": "curve",
"options": [
"Smooth",
"Straight",
"Stepline"
],
"options": ["Smooth", "Straight", "Stepline"],
"defaultValue": "Smooth"
}
]
@ -4328,11 +4159,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -4349,11 +4176,7 @@
"type": "select",
"label": "Curve",
"key": "curve",
"options": [
"Smooth",
"Straight",
"Stepline"
],
"options": ["Smooth", "Straight", "Stepline"],
"defaultValue": "Smooth"
},
{
@ -4418,11 +4241,7 @@
"type": "select",
"label": "Format",
"key": "yAxisUnits",
"options": [
"Default",
"Thousands",
"Millions"
],
"options": ["Default", "Thousands", "Millions"],
"defaultValue": "Default"
},
{
@ -4443,9 +4262,7 @@
"block": true,
"name": "Table block",
"icon": "Table",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 600,
"height": 400
@ -4483,10 +4300,7 @@
"type": "select",
"label": "Sort Order",
"key": "sortOrder",
"options": [
"Ascending",
"Descending"
],
"options": ["Ascending", "Descending"],
"defaultValue": "Ascending"
},
{
@ -4638,9 +4452,7 @@
"block": true,
"name": "Cards block",
"icon": "PersonalizationField",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 600,
"height": 400
@ -4679,10 +4491,7 @@
"type": "select",
"label": "Sort Order",
"key": "sortOrder",
"options": [
"Ascending",
"Descending"
],
"options": ["Ascending", "Descending"],
"defaultValue": "Descending"
},
{
@ -4816,9 +4625,7 @@
"block": true,
"name": "Repeater block",
"icon": "ViewList",
"illegalChildren": [
"section"
],
"illegalChildren": ["section"],
"hasChildren": true,
"size": {
"width": 400,
@ -4846,10 +4653,7 @@
"type": "select",
"label": "Sort Order",
"key": "sortOrder",
"options": [
"Ascending",
"Descending"
],
"options": ["Ascending", "Descending"],
"defaultValue": "Descending"
},
{
@ -5044,9 +4848,7 @@
"markdownviewer": {
"name": "Markdown Viewer",
"icon": "Preview",
"styles": [
"size"
],
"styles": ["size"],
"size": {
"width": 400,
"height": 100
@ -5063,9 +4865,7 @@
"formblock": {
"name": "Form Block",
"icon": "Form",
"styles": [
"size"
],
"styles": ["size"],
"block": true,
"info": "Form blocks are only compatible with internal or SQL tables",
"size": {
@ -5077,11 +4877,7 @@
"type": "select",
"label": "Type",
"key": "actionType",
"options": [
"Create",
"Update",
"View"
],
"options": ["Create", "Update", "View"],
"defaultValue": "Create"
},
{
@ -5215,10 +5011,7 @@
"name": "Side Panel",
"icon": "RailRight",
"hasChildren": true,
"illegalChildren": [
"section",
"sidepanel"
],
"illegalChildren": ["section", "sidepanel"],
"showEmptyState": false,
"draggable": false,
"info": "Side panels are hidden by default. They will only be revealed when triggered by the 'Open Side Panel' action."
@ -5338,4 +5131,4 @@
}
]
}
}
}

12
packages/client/package.json
View File

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

1
packages/client/src/components/BlockComponent.svelte
View File

@ -24,7 +24,6 @@
// to render this part of the block, taking advantage of binding enrichment
$: id = `${block.id}-${context ?? rand}`
$: instance = {
_blockElementHasChildren: $$slots?.default ?? false,
_component: `@budibase/standard-components/${type}`,
_id: id,
_instanceName: name || type[0].toUpperCase() + type.slice(1),

52
packages/client/src/components/Component.svelte
View File

@ -29,7 +29,6 @@
import Placeholder from "components/app/Placeholder.svelte"
import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte"
import ComponentPlaceholder from "components/app/ComponentPlaceholder.svelte"
import Skeleton from "components/app/Skeleton.svelte"
export let instance = {}
export let isLayout = false
@ -39,7 +38,6 @@
// Get parent contexts
const context = getContext("context")
const loading = getContext("loading")
const insideScreenslot = !!getContext("screenslot")
// Create component context
@ -172,15 +170,6 @@
$: pad = pad || (interactive && hasChildren && inDndPath)
$: $dndIsDragging, (pad = false)
// Determine whether we should render a skeleton loader for this component
$: showSkeleton =
$loading &&
definition?.name !== "Screenslot" &&
children.length === 0 &&
!instance._blockElementHasChildren &&
!definition?.block &&
definition?.skeleton !== false
// Update component context
$: store.set({
id,
@ -507,12 +496,7 @@
})
</script>
{#if showSkeleton}
<Skeleton
height={initialSettings?.height || definition?.size?.height || 0}
width={initialSettings?.width || definition?.size?.width || 0}
/>
{:else if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
{#if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
<!-- The ID is used as a class because getElementsByClassName is O(1) -->
<!-- and the performance matters for the selection indicators -->
<div
@ -530,23 +514,25 @@
data-icon={icon}
data-parent={parent}
>
<svelte:component this={constructor} bind:this={ref} {...initialSettings}>
{#if hasMissingRequiredSettings}
<ComponentPlaceholder />
{:else if children.length}
{#each children as child (child._id)}
<svelte:self instance={child} parent={id} />
{/each}
{:else if emptyState}
{#if isScreen}
<ScreenPlaceholder />
{:else}
<Placeholder />
{#if hasMissingRequiredSettings}
<ComponentPlaceholder />
{:else}
<svelte:component this={constructor} bind:this={ref} {...initialSettings}>
{#if children.length}
{#each children as child (child._id)}
<svelte:self instance={child} parent={id} />
{/each}
{:else if emptyState}
{#if isScreen}
<ScreenPlaceholder />
{:else}
<Placeholder />
{/if}
{:else if isBlock}
<slot />
{/if}
{:else if isBlock}
<slot />
{/if}
</svelte:component>
</svelte:component>
{/if}
</div>
{/if}

4
packages/client/src/components/Router.svelte
View File

@ -1,5 +1,4 @@
<script>
import { writable } from "svelte/store"
import { setContext, getContext, onMount } from "svelte"
import Router, { querystring } from "svelte-spa-router"
import { routeStore, stateStore } from "stores"
@ -10,9 +9,6 @@
const component = getContext("component")
setContext("screenslot", true)
const loading = writable(false)
setContext("loading", loading)
// Only wrap this as an array to take advantage of svelte keying,
// to ensure the svelte-spa-router is fully remounted when route config
// changes

4
packages/client/src/components/app/BackgroundImage.svelte
View File

@ -21,7 +21,9 @@
{#if url}
<div class="outer" use:styleable={$component.styles}>
<div class="inner" {style} />
<div class="inner" {style}>
<slot />
</div>
</div>
{:else if $builderStore.inBuilder}
<div

5
packages/client/src/components/app/ComponentPlaceholder.svelte
View File

@ -3,12 +3,13 @@
import { builderStore } from "stores"
const component = getContext("component")
const { styleable } = getContext("sdk")
$: requiredSetting = $component.missingRequiredSettings?.[0]
</script>
{#if $builderStore.inBuilder && requiredSetting}
<div class="component-placeholder">
<div class="component-placeholder" use:styleable={$component.styles}>
<span>
Add the <mark>{requiredSetting.label}</mark> setting to start using your component
-
@ -32,7 +33,7 @@
}
.component-placeholder mark {
background-color: var(--spectrum-global-color-gray-400);
padding: 0 2px;
padding: 0 4px;
border-radius: 2px;
}
.component-placeholder .spectrum-Link {

71
packages/client/src/components/app/DataProvider.svelte
View File

@ -1,7 +1,6 @@
<script>
import { writable } from "svelte/store"
import { setContext, getContext } from "svelte"
import { Pagination } from "@budibase/bbui"
import { getContext } from "svelte"
import { Pagination, ProgressCircle } from "@budibase/bbui"
import { fetchData, LuceneUtils } from "@budibase/frontend-core"
export let dataSource
@ -14,11 +13,6 @@
const { styleable, Provider, ActionTypes, API } = getContext("sdk")
const component = getContext("component")
// Update loading state
const parentLoading = getContext("loading")
const loading = writable(true)
setContext("loading", loading)
// We need to manage our lucene query manually as we want to allow components
// to extend it
let queryExtensions = {}
@ -26,8 +20,8 @@
$: query = extendQuery(defaultQuery, queryExtensions)
// Fetch data and refresh when needed
$: fetch = createFetch(dataSource, $parentLoading)
$: updateFetch({
$: fetch = createFetch(dataSource)
$: fetch.update({
query,
sortColumn,
sortOrder,
@ -35,9 +29,6 @@
paginate,
})
// Keep loading context updated
$: loading.set($parentLoading || !$fetch.loaded)
// Build our action context
$: actions = [
{
@ -89,18 +80,7 @@
limit,
}
const createFetch = (datasource, parentLoading) => {
// Return a dummy fetch if parent is still loading. We do this so that we
// can still properly subscribe to a valid fetch object and check all
// properties, but we want to avoid fetching the real data until all parents
// have finished loading.
// This logic is only needed due to skeleton loaders, as previously we
// simply blocked component rendering until data was ready.
if (parentLoading) {
return fetchData({ API })
}
// Otherwise return the real thing
const createFetch = datasource => {
return fetchData({
API,
datasource,
@ -114,14 +94,6 @@
})
}
const updateFetch = opts => {
// Only update fetch if parents have stopped loading. Otherwise we will
// trigger a fetch of the real data before parents are ready.
if (!$parentLoading) {
fetch.update(opts)
}
}
const addQueryExtension = (key, extension) => {
if (!key || !extension) {
return
@ -155,17 +127,23 @@
<div use:styleable={$component.styles} class="container">
<Provider {actions} data={dataContext}>
<slot />
{#if paginate && $fetch.supportsPagination}
<div class="pagination">
<Pagination
page={$fetch.pageNumber + 1}
hasPrevPage={$fetch.hasPrevPage}
hasNextPage={$fetch.hasNextPage}
goToPrevPage={fetch.prevPage}
goToNextPage={fetch.nextPage}
/>
{#if !$fetch.loaded}
<div class="loading">
<ProgressCircle />
</div>
{:else}
<slot />
{#if paginate && $fetch.supportsPagination}
<div class="pagination">
<Pagination
page={$fetch.pageNumber + 1}
hasPrevPage={$fetch.hasPrevPage}
hasNextPage={$fetch.hasNextPage}
goToPrevPage={fetch.prevPage}
goToNextPage={fetch.nextPage}
/>
</div>
{/if}
{/if}
</Provider>
</div>
@ -177,6 +155,13 @@
justify-content: flex-start;
align-items: stretch;
}
.loading {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
height: 100px;
}
.pagination {
display: flex;
flex-direction: row;

13
packages/client/src/components/app/Repeater.svelte
View File

@ -12,25 +12,22 @@
const { Provider } = getContext("sdk")
const component = getContext("component")
const loading = getContext("loading")
// If the parent DataProvider is loading, fill the rows array with a number of empty objects corresponding to the DataProvider's page size; this allows skeleton loader components to be rendered further down the tree.
$: rows = $loading
? new Array(dataProvider.limit > 20 ? 20 : dataProvider.limit).fill({})
: dataProvider?.rows
$: rows = dataProvider?.rows ?? []
$: loaded = dataProvider?.loaded ?? true
</script>
<Container {direction} {hAlign} {vAlign} {gap} wrap>
{#if $component.empty}
<Placeholder />
{:else if !$loading && rows.length === 0}
<div class="noRows"><i class="ri-list-check-2" />{noRowsMessage}</div>
{:else}
{:else if rows.length > 0}
{#each rows as row, index}
<Provider data={{ ...row, index }}>
<slot />
</Provider>
{/each}
{:else if loaded && noRowsMessage}
<div class="noRows"><i class="ri-list-check-2" />{noRowsMessage}</div>
{/if}
</Container>

31
packages/client/src/components/app/Skeleton.svelte
View File

@ -1,31 +0,0 @@
<script>
import { getContext } from "svelte"
import { Skeleton } from "@budibase/bbui"
const { styleable } = getContext("sdk")
const component = getContext("component")
export let height
export let width
let styles
$: {
styles = JSON.parse(JSON.stringify($component.styles))
if (!styles.normal.height && height) {
// The height and width props provided to this component can either be numbers or strings set by users (ex. '100%', '100px', '100'). A string of '100' wouldn't be a valid CSS property, but some of our components respect that input, so we need to handle it here also, hence the `!isNaN` check.
styles.normal.height = !isNaN(height) ? `${height}px` : height
}
if (!styles.normal.width && width) {
styles.normal.width = !isNaN(width) ? `${width}px` : width
}
}
</script>
<div use:styleable={styles}>
<Skeleton>
<slot />
</Skeleton>
</div>

232
packages/client/src/components/app/blocks/CardsBlock.svelte
View File

@ -37,6 +37,7 @@
let repeaterId
let schema
let enrichedSearchColumns
let schemaLoaded = false
$: fetchSchema(dataSource)
$: enrichSearchColumns(searchColumns, schema).then(
@ -77,135 +78,138 @@
enrichRelationships: true,
})
}
schemaLoaded = true
}
</script>
<Block>
<BlockComponent
type="form"
bind:id={formId}
props={{ dataSource, disableValidation: true }}
>
{#if title || enrichedSearchColumns?.length || showTitleButton}
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "stretch",
vAlign: "middle",
gap: "M",
wrap: true,
}}
styles={{
normal: {
"margin-bottom": "20px",
},
}}
order={0}
>
<BlockComponent
type="heading"
props={{
text: title,
}}
order={0}
/>
{#if schemaLoaded}
<Block>
<BlockComponent
type="form"
bind:id={formId}
props={{ dataSource, disableValidation: true }}
>
{#if title || enrichedSearchColumns?.length || showTitleButton}
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "left",
hAlign: "stretch",
vAlign: "middle",
gap: "M",
wrap: true,
}}
order={1}
>
{#if enrichedSearchColumns?.length}
{#each enrichedSearchColumns as column, idx}
<BlockComponent
type={column.componentType}
props={{
field: column.name,
placeholder: column.name,
text: column.name,
autoWidth: true,
}}
order={idx}
styles={{
normal: {
width: "192px",
},
}}
/>
{/each}
{/if}
{#if showTitleButton}
<BlockComponent
type="button"
props={{
onClick: titleButtonAction,
text: titleButtonText,
type: "cta",
}}
order={enrichedSearchColumns?.length ?? 0}
/>
{/if}
</BlockComponent>
</BlockComponent>
{/if}
<BlockComponent
type="dataprovider"
bind:id={dataProviderId}
props={{
dataSource,
filter: enrichedFilter,
sortColumn,
sortOrder,
paginate,
limit,
}}
order={1}
>
<BlockComponent
type="repeater"
bind:id={repeaterId}
context="repeater"
props={{
dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
direction: "row",
hAlign: "stretch",
vAlign: "top",
gap: "M",
noRowsMessage: "No rows found",
}}
styles={{
custom: `display: grid;\ngrid-template-columns: repeat(auto-fill, minmax(min(${cardWidth}px, 100%), 1fr));`,
}}
order={0}
>
<BlockComponent
type="spectrumcard"
props={{
title: cardTitle,
subtitle: cardSubtitle,
description: cardDescription,
imageURL: cardImageURL,
horizontal: cardHorizontal,
showButton: showCardButton,
buttonText: cardButtonText,
buttonOnClick: cardButtonOnClick,
linkURL: fullCardURL,
linkPeek: cardPeek,
}}
styles={{
normal: {
width: "auto",
"margin-bottom": "20px",
},
}}
order={0}
/>
>
<BlockComponent
type="heading"
props={{
text: title,
}}
order={0}
/>
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "left",
vAlign: "middle",
gap: "M",
wrap: true,
}}
order={1}
>
{#if enrichedSearchColumns?.length}
{#each enrichedSearchColumns as column, idx}
<BlockComponent
type={column.componentType}
props={{
field: column.name,
placeholder: column.name,
text: column.name,
autoWidth: true,
}}
order={idx}
styles={{
normal: {
width: "192px",
},
}}
/>
{/each}
{/if}
{#if showTitleButton}
<BlockComponent
type="button"
props={{
onClick: titleButtonAction,
text: titleButtonText,
type: "cta",
}}
order={enrichedSearchColumns?.length ?? 0}
/>
{/if}
</BlockComponent>
</BlockComponent>
{/if}
<BlockComponent
type="dataprovider"
bind:id={dataProviderId}
props={{
dataSource,
filter: enrichedFilter,
sortColumn,
sortOrder,
paginate,
limit,
}}
order={1}
>
<BlockComponent
type="repeater"
bind:id={repeaterId}
context="repeater"
props={{
dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
direction: "row",
hAlign: "stretch",
vAlign: "top",
gap: "M",
noRowsMessage: "No rows found",
}}
styles={{
custom: `display: grid;\ngrid-template-columns: repeat(auto-fill, minmax(min(${cardWidth}px, 100%), 1fr));`,
}}
order={0}
>
<BlockComponent
type="spectrumcard"
props={{
title: cardTitle,
subtitle: cardSubtitle,
description: cardDescription,
imageURL: cardImageURL,
horizontal: cardHorizontal,
showButton: showCardButton,
buttonText: cardButtonText,
buttonOnClick: cardButtonOnClick,
linkURL: fullCardURL,
linkPeek: cardPeek,
}}
styles={{
normal: {
width: "auto",
},
}}
order={0}
/>
</BlockComponent>
</BlockComponent>
</BlockComponent>
</BlockComponent>
</Block>
</Block>
{/if}

284
packages/client/src/components/app/blocks/TableBlock.svelte
View File

@ -37,6 +37,7 @@
let schema
let primaryDisplay
let enrichedSearchColumns
let schemaLoaded = false
$: fetchSchema(dataSource)
$: enrichSearchColumns(searchColumns, schema).then(
@ -91,6 +92,7 @@
enrichRelationships: true,
})
}
schemaLoaded = true
}
const getNormalFields = schema => {
@ -114,160 +116,162 @@
}
</script>
<Block>
<BlockComponent
type="form"
bind:id={formId}
props={{
dataSource,
disableValidation: true,
editAutoColumns: true,
size,
}}
>
{#if title || enrichedSearchColumns?.length || showTitleButton}
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "stretch",
vAlign: "middle",
gap: "M",
wrap: true,
}}
styles={{
normal: {
"margin-bottom": "20px",
},
}}
order={0}
>
<BlockComponent
type="heading"
props={{
text: title,
}}
order={0}
/>
{#if schemaLoaded}
<Block>
<BlockComponent
type="form"
bind:id={formId}
props={{
dataSource,
disableValidation: true,
editAutoColumns: true,
size,
}}
>
{#if title || enrichedSearchColumns?.length || showTitleButton}
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "left",
vAlign: "center",
hAlign: "stretch",
vAlign: "middle",
gap: "M",
wrap: true,
}}
order={1}
styles={{
normal: {
"margin-bottom": "20px",
},
}}
order={0}
>
{#if enrichedSearchColumns?.length}
{#each enrichedSearchColumns as column, idx}
<BlockComponent
type="heading"
props={{
text: title,
}}
order={0}
/>
<BlockComponent
type="container"
props={{
direction: "row",
hAlign: "left",
vAlign: "center",
gap: "M",
wrap: true,
}}
order={1}
>
{#if enrichedSearchColumns?.length}
{#each enrichedSearchColumns as column, idx}
<BlockComponent
type={column.componentType}
props={{
field: column.name,
placeholder: column.name,
text: column.name,
autoWidth: true,
}}
styles={{
normal: {
width: "192px",
},
}}
order={idx}
/>
{/each}
{/if}
{#if showTitleButton}
<BlockComponent
type={column.componentType}
type="button"
props={{
field: column.name,
placeholder: column.name,
text: column.name,
autoWidth: true,
onClick: buttonClickActions,
text: titleButtonText,
type: "cta",
}}
styles={{
normal: {
width: "192px",
},
}}
order={idx}
order={enrichedSearchColumns?.length ?? 0}
/>
{/each}
{/if}
{#if showTitleButton}
<BlockComponent
type="button"
props={{
onClick: buttonClickActions,
text: titleButtonText,
type: "cta",
}}
order={enrichedSearchColumns?.length ?? 0}
/>
{/if}
{/if}
</BlockComponent>
</BlockComponent>
</BlockComponent>
{/if}
<BlockComponent
type="dataprovider"
bind:id={dataProviderId}
props={{
dataSource,
filter: enrichedFilter,
sortColumn: sortColumn || primaryDisplay,
sortOrder,
paginate,
limit: rowCount,
}}
order={1}
>
{/if}
<BlockComponent
type="table"
context="table"
type="dataprovider"
bind:id={dataProviderId}
props={{
dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
columns: tableColumns,
rowCount,
quiet,
compact,
allowSelectRows,
size,
onClick: rowClickActions,
dataSource,
filter: enrichedFilter,
sortColumn: sortColumn || primaryDisplay,
sortOrder,
paginate,
limit: rowCount,
}}
/>
order={1}
>
<BlockComponent
type="table"
context="table"
props={{
dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
columns: tableColumns,
rowCount,
quiet,
compact,
allowSelectRows,
size,
onClick: rowClickActions,
}}
/>
</BlockComponent>
{#if clickBehaviour === "details"}
<BlockComponent
name="Details side panel"
type="sidepanel"
bind:id={detailsSidePanelId}
context="details-side-panel"
order={2}
>
<BlockComponent
name="Details form block"
type="formblock"
bind:id={detailsFormBlockId}
props={{
dataSource,
showSaveButton: true,
showDeleteButton: true,
actionType: "Update",
rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
fields: normalFields,
title: editTitle,
labelPosition: "left",
}}
/>
</BlockComponent>
{/if}
{#if showTitleButton && titleButtonClickBehaviour === "new"}
<BlockComponent
name="New row side panel"
type="sidepanel"
bind:id={newRowSidePanelId}
context="new-side-panel"
order={3}
>
<BlockComponent
name="New row form block"
type="formblock"
props={{
dataSource,
showSaveButton: true,
showDeleteButton: false,
actionType: "Create",
fields: normalFields,
title: "Create Row",
labelPosition: "left",
}}
/>
</BlockComponent>
{/if}
</BlockComponent>
{#if clickBehaviour === "details"}
<BlockComponent
name="Details side panel"
type="sidepanel"
bind:id={detailsSidePanelId}
context="details-side-panel"
order={2}
>
<BlockComponent
name="Details form block"
type="formblock"
bind:id={detailsFormBlockId}
props={{
dataSource,
showSaveButton: true,
showDeleteButton: true,
actionType: "Update",
rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
fields: normalFields,
title: editTitle,
labelPosition: "left",
}}
/>
</BlockComponent>
{/if}
{#if showTitleButton && titleButtonClickBehaviour === "new"}
<BlockComponent
name="New row side panel"
type="sidepanel"
bind:id={newRowSidePanelId}
context="new-side-panel"
order={3}
>
<BlockComponent
name="New row form block"
type="formblock"
props={{
dataSource,
showSaveButton: true,
showDeleteButton: false,
actionType: "Create",
fields: normalFields,
title: "Create Row",
labelPosition: "left",
}}
/>
</BlockComponent>
{/if}
</BlockComponent>
</Block>
</Block>
{/if}

7
packages/client/src/components/app/forms/Field.svelte
View File

@ -1,7 +1,6 @@
<script>
import Placeholder from "../Placeholder.svelte"
import FieldGroupFallback from "./FieldGroupFallback.svelte"
import Skeleton from "../Skeleton.svelte"
import { getContext, onDestroy } from "svelte"
export let label
@ -54,8 +53,6 @@
builderStore.actions.updateProp("label", e.target.textContent)
}
const loading = getContext("loading")
onDestroy(() => {
fieldApi?.deregister()
unsubscribe?.()
@ -79,10 +76,6 @@
<div class="spectrum-Form-itemField">
{#if !formContext}
<Placeholder text="Form components need to be wrapped in a form" />
{:else if $loading}
<Skeleton>
<slot />
</Skeleton>
{:else if !fieldState}
<Placeholder />
{:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)}

43
packages/client/src/components/app/forms/Form.svelte
View File

@ -1,8 +1,7 @@
<script>
import { getContext, setContext } from "svelte"
import { getContext } from "svelte"
import InnerForm from "./InnerForm.svelte"
import { Helpers } from "@budibase/bbui"
import { writable } from "svelte/store"
export let dataSource
export let theme
@ -21,11 +20,6 @@
const context = getContext("context")
const { API, fetchDatasourceSchema } = getContext("sdk")
// Forms also use loading context as they require loading a schema
const parentLoading = getContext("loading")
const loading = writable(true)
setContext("loading", loading)
let loaded = false
let schema
let table
@ -36,7 +30,6 @@
$: resetKey = Helpers.hashString(
schemaKey + JSON.stringify(initialValues) + disabled
)
$: loading.set($parentLoading || !loaded)
// Returns the closes data context which isn't a built in context
const getInitialValues = (type, dataSource, context) => {
@ -86,19 +79,21 @@
}
</script>
{#key resetKey}
<InnerForm
{dataSource}
{theme}
{size}
{disabled}
{actionType}
{schema}
{table}
{initialValues}
{disableValidation}
{editAutoColumns}
>
<slot />
</InnerForm>
{/key}
{#if loaded}
{#key resetKey}
<InnerForm
{dataSource}
{theme}
{size}
{disabled}
{actionType}
{schema}
{table}
{initialValues}
{disableValidation}
{editAutoColumns}
>
<slot />
</InnerForm>
{/key}
{/if}

15
packages/client/src/components/app/table/Table.svelte
View File

@ -1,6 +1,6 @@
<script>
import { getContext } from "svelte"
import { Table, Skeleton } from "@budibase/bbui"
import { Table } from "@budibase/bbui"
import SlotRenderer from "./SlotRenderer.svelte"
import { UnsortableTypes } from "../../../constants"
import { onDestroy } from "svelte"
@ -14,7 +14,6 @@
export let compact
export let onClick
const loading = getContext("loading")
const component = getContext("component")
const { styleable, getAction, ActionTypes, rowSelectionStore } =
getContext("sdk")
@ -29,6 +28,7 @@
let selectedRows = []
$: hasChildren = $component.children
$: loading = dataProvider?.loading ?? false
$: data = dataProvider?.rows || []
$: fullSchema = dataProvider?.schema ?? {}
$: fields = getFields(fullSchema, columns, false)
@ -130,7 +130,7 @@
<Table
{data}
{schema}
loading={$loading}
{loading}
{rowCount}
{quiet}
{compact}
@ -145,9 +145,6 @@
on:sort={onSort}
on:click={handleClick}
>
<div class="skeleton" slot="loadingIndicator">
<Skeleton />
</div>
<slot />
</Table>
{#if allowSelectRows && selectedRows.length}
@ -161,12 +158,6 @@
div {
background-color: var(--spectrum-alias-background-color-secondary);
}
.skeleton {
height: 100%;
width: 100%;
}
.row-count {
margin-top: var(--spacing-l);
}

1
packages/client/src/stores/index.js
View File

@ -16,6 +16,7 @@ export { rowSelectionStore } from "./rowSelection.js"
export { blockStore } from "./blocks.js"
export { environmentStore } from "./environment"
export { eventStore } from "./events.js"
export { orgStore } from "./org.js"
export {
dndStore,
dndIndex,

2
packages/client/src/stores/initialise.js
View File

@ -1,7 +1,9 @@
import { routeStore } from "./routes"
import { appStore } from "./app"
import { orgStore } from "./org"
export async function initialise() {
await routeStore.actions.fetchRoutes()
await appStore.actions.fetchAppDefinition()
await orgStore.actions.init()
}

29
packages/client/src/stores/org.js Normal file
View File

@ -0,0 +1,29 @@
import { API } from "api"
import { writable, get } from "svelte/store"
import { appStore } from "./app"
const createOrgStore = () => {
const store = writable(null)
const { subscribe, set } = store
async function init() {
const tenantId = get(appStore).application?.tenantId
if (!tenantId) return
try {
const settingsConfigDoc = await API.getTenantConfig(tenantId)
set({ logoUrl: settingsConfigDoc.config.logoUrl })
} catch (e) {
console.log("Could not init org ", e)
}
}
return {
subscribe,
actions: {
init,
},
}
}
export const orgStore = createOrgStore()

8
packages/client/src/stores/screens.js
View File

@ -2,6 +2,7 @@ import { derived } from "svelte/store"
import { routeStore } from "./routes"
import { builderStore } from "./builder"
import { appStore } from "./app"
import { orgStore } from "./org"
import { dndIndex, dndParent, dndIsNewComponent, dndBounds } from "./dnd.js"
import { RoleUtils } from "@budibase/frontend-core"
import { findComponentById, findComponentParent } from "../utils/components.js"
@ -14,6 +15,7 @@ const createScreenStore = () => {
appStore,
routeStore,
builderStore,
orgStore,
dndParent,
dndIndex,
dndIsNewComponent,
@ -23,6 +25,7 @@ const createScreenStore = () => {
$appStore,
$routeStore,
$builderStore,
$orgStore,
$dndParent,
$dndIndex,
$dndIsNewComponent,
@ -146,6 +149,11 @@ const createScreenStore = () => {
if (!navigationSettings.title && !navigationSettings.hideTitle) {
navigationSettings.title = $appStore.application?.name
}
// Default to the org logo
if (!navigationSettings.logoUrl) {
navigationSettings.logoUrl = $orgStore?.logoUrl
}
}
activeLayout = {
_id: "layout",

5
packages/client/yarn.lock
View File

@ -23,11 +23,6 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
"@budibase/types@2.4.8-alpha.4":
version "2.4.8-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8-alpha.4.tgz#4e6dec50eef381994432ef4d08587a9a7156dd84"
integrity sha512-aiHHOvsDLHQ2OFmLgaSUttQwSuaPBqF1lbyyCkEJIbbl/qo9EPNZGl+AkB7wo12U5HdqWhr9OpFL12EqkcD4GA==
"@jridgewell/gen-mapping@^0.3.0":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"

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

@ -1,13 +1,13 @@
{
"name": "@budibase/frontend-core",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "2.4.12-alpha.3",
"@budibase/shared-core": "2.4.12-alpha.3",
"@budibase/bbui": "2.4.27-alpha.9",
"@budibase/shared-core": "2.4.27-alpha.9",
"dayjs": "^1.11.7",
"lodash": "^4.17.21",
"socket.io-client": "^4.6.1",

12
packages/frontend-core/src/api/configs.js
View File

@ -73,6 +73,18 @@ export const buildConfigEndpoints = API => ({
})
},
/**
* Updates the company favicon for the environment.
* @param data the favicon form data
*/
uploadFavicon: async data => {
return await API.post({
url: "/api/global/configs/upload/settings/faviconUrl",
body: data,
json: false,
})
},
/**
* Uploads a logo for an OIDC provider.
* @param name the name of the OIDC provider

38
packages/frontend-core/src/components/TestimonialPage.svelte
View File

@ -5,6 +5,8 @@
import Covanta from "../../assets/covanta.png"
import Schnellecke from "../../assets/schnellecke.png"
export let enabled = true
const testimonials = [
{
text: "Budibase was the only solution that checked all the boxes for Covanta. Covanta expects to realize $3.2MM in savings due to the elimination of redundant data entry.",
@ -33,23 +35,25 @@
<SplitPage>
<slot />
<div class="wrapper" slot="right">
<div class="testimonial">
<Layout noPadding gap="S">
<img
width={testimonial.imageSize}
alt="a-happy-budibase-user"
src={testimonial.image}
/>
<div class="text">
"{testimonial.text}"
</div>
<div class="author">
<div class="name">{testimonial.name}</div>
<div class="company">{testimonial.role}</div>
</div>
</Layout>
</div>
<div class:wrapper={enabled} slot="right">
{#if enabled}
<div class="testimonial">
<Layout noPadding gap="S">
<img
width={testimonial.imageSize}
alt="a-happy-budibase-user"
src={testimonial.image}
/>
<div class="text">
"{testimonial.text}"
</div>
<div class="author">
<div class="name">{testimonial.name}</div>
<div class="company">{testimonial.role}</div>
</div>
</Layout>
</div>
{/if}
</div>
</SplitPage>

1
packages/frontend-core/src/constants.js
View File

@ -68,6 +68,7 @@ export const Features = {
ENVIRONMENT_VARIABLES: "environmentVariables",
AUDIT_LOGS: "auditLogs",
ENFORCEABLE_SSO: "enforceableSSO",
BRANDING: "branding",
}
// Role IDs

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

7
packages/server/__mocks__/node-fetch.ts
View File

@ -4,6 +4,7 @@ module FetchMock {
// @ts-ignore
const fetch = jest.requireActual("node-fetch")
let failCount = 0
let mockSearch = false
const func = async (url: any, opts: any) => {
function json(body: any, status = 200) {
@ -69,7 +70,7 @@ module FetchMock {
},
404
)
} else if (url.includes("_search")) {
} else if (mockSearch && url.includes("_search")) {
const body = opts.body
const parts = body.split("tableId:")
let tableId
@ -192,5 +193,9 @@ module FetchMock {
func.Headers = fetch.Headers
func.mockSearch = () => {
mockSearch = true
}
module.exports = func
}

1
packages/server/jest.config.ts
View File

@ -43,6 +43,7 @@ const config: Config.InitialOptions = {
"../backend-core/src/**/*.{js,ts}",
// The use of coverage with couchdb view functions breaks tests
"!src/db/views/staticViews.*",
"!src/**/*.spec.{js,ts}",
],
coverageReporters: ["lcov", "json", "clover"],
}

25
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.4.12-alpha.3",
"version": "2.4.27-alpha.9",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -14,7 +14,8 @@
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
"postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
"test": "bash scripts/test.sh",
"test": "NODE_OPTIONS=\"--max-old-space-size=4096\" bash scripts/test.sh",
"test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
"test:watch": "jest --watch",
"predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
"build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
@ -43,12 +44,12 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.4.12-alpha.3",
"@budibase/client": "2.4.12-alpha.3",
"@budibase/pro": "2.4.12-alpha.3",
"@budibase/shared-core": "2.4.12-alpha.3",
"@budibase/string-templates": "2.4.12-alpha.3",
"@budibase/types": "2.4.12-alpha.3",
"@budibase/backend-core": "2.4.27-alpha.9",
"@budibase/client": "2.4.27-alpha.9",
"@budibase/pro": "2.4.27-alpha.9",
"@budibase/shared-core": "2.4.27-alpha.9",
"@budibase/string-templates": "2.4.27-alpha.9",
"@budibase/types": "2.4.27-alpha.9",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",
@ -126,7 +127,7 @@
"@babel/core": "7.17.4",
"@babel/preset-env": "7.16.11",
"@budibase/standard-components": "^0.9.139",
"@jest/test-sequencer": "24.9.0",
"@jest/test-sequencer": "29.5.0",
"@swc/core": "^1.3.25",
"@swc/jest": "^0.2.24",
"@trendyol/jest-testcontainers": "^2.1.1",
@ -135,7 +136,7 @@
"@types/global-agent": "2.1.1",
"@types/google-spreadsheet": "3.1.5",
"@types/ioredis": "4.28.10",
"@types/jest": "27.5.1",
"@types/jest": "29.5.0",
"@types/koa": "2.13.4",
"@types/koa__router": "8.0.8",
"@types/lodash": "4.14.180",
@ -155,7 +156,7 @@
"eslint": "6.8.0",
"ioredis-mock": "7.2.0",
"is-wsl": "2.2.0",
"jest": "28.1.1",
"jest": "29.5.0",
"jest-openapi": "0.14.2",
"jest-serial-runner": "^1.2.1",
"nodemon": "2.0.15",
@ -167,7 +168,7 @@
"supertest": "6.2.2",
"swagger-jsdoc": "6.1.0",
"timekeeper": "2.2.0",
"ts-jest": "28.0.4",
"ts-jest": "29.0.5",
"ts-node": "10.8.1",
"tsconfig-paths": "4.0.0",
"typescript": "4.7.3",

6
packages/server/scripts/test.sh
View File

@ -3,10 +3,10 @@
if [[ -n $CI ]]
then
# --runInBand performs better in ci where resources are limited
echo "jest --coverage --runInBand"
jest --coverage --runInBand
echo "jest --coverage --runInBand --forceExit"
jest --coverage --runInBand --forceExit
else
# --maxWorkers performs better in development
echo "jest --coverage --maxWorkers=2"
jest --coverage --maxWorkers=2
fi
fi

41
packages/server/src/api/controllers/application.ts
View File

@ -20,10 +20,10 @@ import {
cache,
tenancy,
context,
errors,
events,
migrations,
objectStore,
ErrorCode,
} from "@budibase/backend-core"
import { USERS_TABLE_SCHEMA } from "../../constants"
import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
@ -44,7 +44,6 @@ import {
Layout,
Screen,
MigrationType,
BBContext,
Database,
UserCtx,
} from "@budibase/types"
@ -74,14 +73,14 @@ async function getScreens() {
).rows.map((row: any) => row.doc)
}
function getUserRoleId(ctx: BBContext) {
function getUserRoleId(ctx: UserCtx) {
return !ctx.user?.role || !ctx.user.role._id
? roles.BUILTIN_ROLE_IDS.PUBLIC
: ctx.user.role._id
}
function checkAppUrl(
ctx: BBContext,
ctx: UserCtx,
apps: App[],
url: string,
currentAppId?: string
@ -95,7 +94,7 @@ function checkAppUrl(
}
function checkAppName(
ctx: BBContext,
ctx: UserCtx,
apps: App[],
name: string,
currentAppId?: string
@ -160,7 +159,7 @@ async function addDefaultTables(db: Database) {
await db.bulkDocs([...defaultDbDocs])
}
export async function fetch(ctx: BBContext) {
export async function fetch(ctx: UserCtx) {
const dev = ctx.query && ctx.query.status === AppStatus.DEV
const all = ctx.query && ctx.query.status === AppStatus.ALL
const apps = (await dbCore.getAllApps({ dev, all })) as App[]
@ -185,7 +184,7 @@ export async function fetch(ctx: BBContext) {
ctx.body = await checkAppMetadata(apps)
}
export async function fetchAppDefinition(ctx: BBContext) {
export async function fetchAppDefinition(ctx: UserCtx) {
const layouts = await getLayouts()
const userRoleId = getUserRoleId(ctx)
const accessController = new roles.AccessController()
@ -231,7 +230,7 @@ export async function fetchAppPackage(ctx: UserCtx) {
}
}
async function performAppCreate(ctx: BBContext) {
async function performAppCreate(ctx: UserCtx) {
const apps = (await dbCore.getAllApps({ dev: true })) as App[]
const name = ctx.request.body.name,
possibleUrl = ctx.request.body.url
@ -360,7 +359,7 @@ async function creationEvents(request: any, app: App) {
}
}
async function appPostCreate(ctx: BBContext, app: App) {
async function appPostCreate(ctx: UserCtx, app: App) {
const tenantId = tenancy.getTenantId()
await migrations.backPopulateMigrations({
type: MigrationType.APP,
@ -378,7 +377,7 @@ async function appPostCreate(ctx: BBContext, app: App) {
return quotas.addRows(rowCount)
})
} catch (err: any) {
if (err.code && err.code === errors.codes.USAGE_LIMIT_EXCEEDED) {
if (err.code && err.code === ErrorCode.USAGE_LIMIT_EXCEEDED) {
// this import resulted in row usage exceeding the quota
// delete the app
// skip pre and post-steps as no rows have been added to quotas yet
@ -391,7 +390,7 @@ async function appPostCreate(ctx: BBContext, app: App) {
}
}
export async function create(ctx: BBContext) {
export async function create(ctx: UserCtx) {
const newApplication = await quotas.addApp(() => performAppCreate(ctx))
await appPostCreate(ctx, newApplication)
await cache.bustCache(cache.CacheKey.CHECKLIST)
@ -401,7 +400,7 @@ export async function create(ctx: BBContext) {
// This endpoint currently operates as a PATCH rather than a PUT
// Thus name and url fields are handled only if present
export async function update(ctx: BBContext) {
export async function update(ctx: UserCtx) {
const apps = (await dbCore.getAllApps({ dev: true })) as App[]
// validation
const name = ctx.request.body.name,
@ -421,7 +420,7 @@ export async function update(ctx: BBContext) {
ctx.body = app
}
export async function updateClient(ctx: BBContext) {
export async function updateClient(ctx: UserCtx) {
// Get current app version
const db = context.getAppDB()
const application = await db.get(DocumentType.APP_METADATA)
@ -445,7 +444,7 @@ export async function updateClient(ctx: BBContext) {
ctx.body = app
}
export async function revertClient(ctx: BBContext) {
export async function revertClient(ctx: UserCtx) {
// Check app can be reverted
const db = context.getAppDB()
const application = await db.get(DocumentType.APP_METADATA)
@ -471,7 +470,7 @@ export async function revertClient(ctx: BBContext) {
ctx.body = app
}
const unpublishApp = async (ctx: any) => {
async function unpublishApp(ctx: UserCtx) {
let appId = ctx.params.appId
appId = dbCore.getProdAppID(appId)
@ -487,7 +486,7 @@ const unpublishApp = async (ctx: any) => {
return result
}
async function destroyApp(ctx: BBContext) {
async function destroyApp(ctx: UserCtx) {
let appId = ctx.params.appId
appId = dbCore.getProdAppID(appId)
const devAppId = dbCore.getDevAppID(appId)
@ -515,12 +514,12 @@ async function destroyApp(ctx: BBContext) {
return result
}
async function preDestroyApp(ctx: BBContext) {
async function preDestroyApp(ctx: UserCtx) {
const { rows } = await getUniqueRows([ctx.params.appId])
ctx.rowCount = rows.length
}
async function postDestroyApp(ctx: BBContext) {
async function postDestroyApp(ctx: UserCtx) {
const rowCount = ctx.rowCount
await groups.cleanupApp(ctx.params.appId)
if (rowCount) {
@ -528,7 +527,7 @@ async function postDestroyApp(ctx: BBContext) {
}
}
export async function destroy(ctx: BBContext) {
export async function destroy(ctx: UserCtx) {
await preDestroyApp(ctx)
const result = await destroyApp(ctx)
await postDestroyApp(ctx)
@ -536,7 +535,7 @@ export async function destroy(ctx: BBContext) {
ctx.body = result
}
export const unpublish = async (ctx: BBContext) => {
export async function unpublish(ctx: UserCtx) {
const prodAppId = dbCore.getProdAppID(ctx.params.appId)
const dbExists = await dbCore.dbExists(prodAppId)
@ -551,7 +550,7 @@ export const unpublish = async (ctx: BBContext) => {
ctx.status = 204
}
export async function sync(ctx: BBContext) {
export async function sync(ctx: UserCtx) {
const appId = ctx.params.appId
try {
ctx.body = await sdk.applications.syncApp(appId)

Some files were not shown because too many files have changed in this diff Show More