diff --git a/.eslintrc.json b/.eslintrc.json index 2c810eecc5..d475bba8d1 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,5 @@ { + "root": true, "env": { "browser": true, "es6": true, @@ -53,7 +54,8 @@ "ignoreRestSiblings": true } ], - "local-rules/no-budibase-imports": "error" + "no-redeclare": "off", + "@typescript-eslint/no-redeclare": "error" } }, { diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index fd4d8cf7c8..7f1e08601a 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -92,8 +92,6 @@ jobs: test-libraries: runs-on: ubuntu-latest - env: - REUSE_CONTAINERS: true steps: - name: Checkout repo uses: actions/checkout@v4 @@ -150,8 +148,6 @@ jobs: test-server: runs-on: budi-tubby-tornado-quad-core-150gb - env: - REUSE_CONTAINERS: true steps: - name: Checkout repo uses: actions/checkout@v4 @@ -174,7 +170,8 @@ jobs: docker pull mongo:7.0-jammy & docker pull mariadb:lts & docker pull testcontainers/ryuk:0.5.1 & - docker pull budibase/couchdb:v3.2.1-sql & + docker pull budibase/couchdb:v3.2.1-sqs & + docker pull minio/minio & docker pull redis & wait $(jobs -p) diff --git a/.prettierignore b/.prettierignore index 87f0191a94..72cdc75a23 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,4 +12,5 @@ packages/pro/coverage packages/account-portal/packages/ui/build packages/account-portal/packages/ui/.routify packages/account-portal/packages/server/build +packages/account-portal/packages/server/coverage **/*.ivm.bundle.js \ No newline at end of file diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index b380908dd1..ed7166ec5d 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -106,6 +106,8 @@ spec: value: {{ .Values.services.objectStore.globalBucketName | quote }} - name: BACKUPS_BUCKET_NAME value: {{ .Values.services.objectStore.backupsBucketName | quote }} + - name: TEMP_BUCKET_NAME + value: {{ .Values.globals.tempBucketName | quote }} - name: PORT value: {{ .Values.services.apps.port | quote }} {{ if .Values.services.worker.publicApiRateLimitPerSecond }} diff --git a/charts/budibase/templates/automation-worker-service-deployment.yaml b/charts/budibase/templates/automation-worker-service-deployment.yaml index 51fa9ee4bb..3c6f94ae9e 100644 --- a/charts/budibase/templates/automation-worker-service-deployment.yaml +++ b/charts/budibase/templates/automation-worker-service-deployment.yaml @@ -107,6 +107,8 @@ spec: value: {{ .Values.services.objectStore.globalBucketName | quote }} - name: BACKUPS_BUCKET_NAME value: {{ .Values.services.objectStore.backupsBucketName | quote }} + - name: TEMP_BUCKET_NAME + value: {{ .Values.globals.tempBucketName | quote }} - name: PORT value: {{ .Values.services.automationWorkers.port | quote }} {{ if .Values.services.worker.publicApiRateLimitPerSecond }} diff --git a/charts/budibase/templates/automation-worker-service-hpa.yaml b/charts/budibase/templates/automation-worker-service-hpa.yaml index f29223b61b..18f9690c00 100644 --- a/charts/budibase/templates/automation-worker-service-hpa.yaml +++ b/charts/budibase/templates/automation-worker-service-hpa.yaml @@ -2,7 +2,7 @@ apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }} kind: HorizontalPodAutoscaler metadata: - name: {{ include "budibase.fullname" . }}-apps + name: {{ include "budibase.fullname" . }}-automation-worker labels: {{- include "budibase.labels" . | nindent 4 }} spec: diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index e37b2bc0e4..66a9bb6c14 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -106,6 +106,8 @@ spec: value: {{ .Values.services.objectStore.globalBucketName | quote }} - name: BACKUPS_BUCKET_NAME value: {{ .Values.services.objectStore.backupsBucketName | quote }} + - name: TEMP_BUCKET_NAME + value: {{ .Values.globals.tempBucketName | quote }} - name: PORT value: {{ .Values.services.worker.port | quote }} - name: MULTI_TENANCY diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 9ace768625..27037cdaa8 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -121,6 +121,9 @@ globals: # to the old value for the duration of the rotation. jwtSecretFallback: "" + ## -- If using S3 the bucket name to be used for storing temporary files + tempBucketName: "" + smtp: # -- Whether to enable SMTP or not. enabled: false diff --git a/globalSetup.ts b/globalSetup.ts index 115796c395..dd1454b6e1 100644 --- a/globalSetup.ts +++ b/globalSetup.ts @@ -1,19 +1,52 @@ -import { GenericContainer, Wait } from "testcontainers" +import { + GenericContainer, + Wait, + getContainerRuntimeClient, +} from "testcontainers" +import { ContainerInfo } from "dockerode" import path from "path" import lockfile from "proper-lockfile" +async function getBudibaseContainers() { + const client = await getContainerRuntimeClient() + const conatiners = await client.container.list() + return conatiners.filter( + container => + container.Labels["com.budibase"] === "true" && + container.Labels["org.testcontainers"] === "true" + ) +} + +async function killContainers(containers: ContainerInfo[]) { + const client = await getContainerRuntimeClient() + for (const container of containers) { + const c = client.container.getById(container.Id) + await c.kill() + await c.remove() + } +} + export default async function setup() { const lockPath = path.resolve(__dirname, "globalSetup.ts") - if (process.env.REUSE_CONTAINERS) { - // If you run multiple tests at the same time, it's possible for the CouchDB - // shared container to get started multiple times despite having an - // identical reuse hash. To avoid that, we do a filesystem-based lock so - // that only one globalSetup.ts is running at a time. - lockfile.lockSync(lockPath) - } + // If you run multiple tests at the same time, it's possible for the CouchDB + // shared container to get started multiple times despite having an + // identical reuse hash. To avoid that, we do a filesystem-based lock so + // that only one globalSetup.ts is running at a time. + lockfile.lockSync(lockPath) + + // Remove any containers that are older than 24 hours. This is to prevent + // containers getting full volumes or accruing any other problems from being + // left up for very long periods of time. + const threshold = new Date(Date.now() - 1000 * 60 * 60 * 24) + const containers = (await getBudibaseContainers()).filter(container => { + const created = new Date(container.Created * 1000) + return created < threshold + }) + + await killContainers(containers) try { - let couchdb = new GenericContainer("budibase/couchdb:v3.2.1-sqs") + const couchdb = new GenericContainer("budibase/couchdb:v3.2.1-sqs") .withExposedPorts(5984, 4984) .withEnvironment({ COUCHDB_PASSWORD: "budibase", @@ -28,20 +61,29 @@ export default async function setup() { target: "/opt/couchdb/etc/local.d/test-couchdb.ini", }, ]) + .withLabels({ "com.budibase": "true" }) + .withReuse() .withWaitStrategy( Wait.forSuccessfulCommand( "curl http://budibase:budibase@localhost:5984/_up" ).withStartupTimeout(20000) ) - if (process.env.REUSE_CONTAINERS) { - couchdb = couchdb.withReuse() - } + const minio = new GenericContainer("minio/minio") + .withExposedPorts(9000) + .withCommand(["server", "/data"]) + .withEnvironment({ + MINIO_ACCESS_KEY: "budibase", + MINIO_SECRET_KEY: "budibase", + }) + .withLabels({ "com.budibase": "true" }) + .withReuse() + .withWaitStrategy( + Wait.forHttp("/minio/health/ready", 9000).withStartupTimeout(10000) + ) - await couchdb.start() + await Promise.all([couchdb.start(), minio.start()]) } finally { - if (process.env.REUSE_CONTAINERS) { - lockfile.unlockSync(lockPath) - } + lockfile.unlockSync(lockPath) } } diff --git a/hosting/couchdb/runner.v2.sh b/hosting/couchdb/runner.v2.sh index 7ee24327a1..f8cbe49b8f 100644 --- a/hosting/couchdb/runner.v2.sh +++ b/hosting/couchdb/runner.v2.sh @@ -70,10 +70,10 @@ sed -i "s#COUCHDB_ERLANG_COOKIE#${COUCHDB_ERLANG_COOKIE}#g" /opt/clouseau/clouse /opt/clouseau/bin/clouseau > /dev/stdout 2>&1 & # Start CouchDB. -/docker-entrypoint.sh /opt/couchdb/bin/couchdb & +/docker-entrypoint.sh /opt/couchdb/bin/couchdb > /dev/stdout 2>&1 & -# Start SQS. -/opt/sqs/sqs --server "http://localhost:5984" --data-dir ${DATA_DIR}/sqs --bind-address=0.0.0.0 & +# Start SQS. Use 127.0.0.1 instead of localhost to avoid IPv6 issues. +/opt/sqs/sqs --server "http://127.0.0.1:5984" --data-dir ${DATA_DIR}/sqs --bind-address=0.0.0.0 > /dev/stdout 2>&1 & # Wait for CouchDB to start up. while [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; do diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index be01056b53..e8ac306c51 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -19,9 +19,6 @@ RUN chmod +x ./scripts/removeWorkspaceDependencies.sh RUN ./scripts/removeWorkspaceDependencies.sh packages/server/package.json RUN ./scripts/removeWorkspaceDependencies.sh packages/worker/package.json - -# We will never want to sync pro, but the script is still required -RUN echo '' > scripts/syncProPackage.js RUN jq 'del(.scripts.postinstall)' package.json > temp.json && mv temp.json package.json RUN ./scripts/removeWorkspaceDependencies.sh package.json RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production --frozen-lockfile diff --git a/lerna.json b/lerna.json index 728cddc194..16dc73aa30 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.23.11", + "version": "2.25.0", "npmClient": "yarn", "packages": [ "packages/*", diff --git a/package.json b/package.json index e60a086e17..98524e0ee4 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "yargs": "^17.7.2" }, "scripts": { - "preinstall": "node scripts/syncProPackage.js", "get-past-client-version": "node scripts/getPastClientVersion.js", "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev", "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream", @@ -60,7 +59,8 @@ "dev:all": "yarn run kill-all && lerna run --stream dev", "dev:built": "yarn run kill-all && cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream dev:built", "dev:docker": "./scripts/devDocker.sh", - "test": "REUSE_CONTAINERS=1 lerna run --concurrency 1 --stream test --stream", + "test": "lerna run --concurrency 1 --stream test --stream", + "test:containers:kill": "./scripts/killTestcontainers.sh", "lint:eslint": "eslint packages --max-warnings=0", "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\"", "lint": "yarn run lint:eslint && yarn run lint:prettier", @@ -107,6 +107,7 @@ "@budibase/shared-core": "0.0.0", "@budibase/string-templates": "0.0.0", "@budibase/types": "0.0.0", + "@budibase/pro": "npm:@budibase/pro@latest", "tough-cookie": "4.1.3", "node-fetch": "2.6.7", "semver": "7.5.3", diff --git a/packages/backend-core/src/cache/user.ts b/packages/backend-core/src/cache/user.ts index ecfa20f99e..d319c5dcb6 100644 --- a/packages/backend-core/src/cache/user.ts +++ b/packages/backend-core/src/cache/user.ts @@ -69,7 +69,7 @@ async function populateUsersFromDB( export async function getUser( userId: string, tenantId?: string, - populateUser?: any + populateUser?: (userId: string, tenantId: string) => Promise ) { if (!populateUser) { populateUser = populateFromDB @@ -83,7 +83,7 @@ export async function getUser( } const client = await redis.getUserClient() // try cache - let user = await client.get(userId) + let user: User = await client.get(userId) if (!user) { user = await populateUser(userId, tenantId) await client.store(userId, user, EXPIRY_SECONDS) diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 6cea7efeba..4beb02c9c7 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -281,7 +281,7 @@ export function doInScimContext(task: any) { return newContext(updates, task) } -export async function ensureSnippetContext() { +export async function ensureSnippetContext(enabled = !env.isTest()) { const ctx = getCurrentContext() // If we've already added snippets to context, continue @@ -292,7 +292,7 @@ export async function ensureSnippetContext() { // Otherwise get snippets for this app and update context let snippets: Snippet[] | undefined const db = getAppDB() - if (db && !env.isTest()) { + if (db && enabled) { const app = await db.get(DocumentType.APP_METADATA) snippets = app.snippets } diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts index d220d0a8ac..ef351f7d4d 100644 --- a/packages/backend-core/src/db/couch/DatabaseImpl.ts +++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts @@ -3,11 +3,11 @@ import { AllDocsResponse, AnyDocument, Database, - DatabaseOpts, - DatabaseQueryOpts, - DatabasePutOpts, DatabaseCreateIndexOpts, DatabaseDeleteIndexOpts, + DatabaseOpts, + DatabasePutOpts, + DatabaseQueryOpts, Document, isDocument, RowResponse, @@ -17,7 +17,7 @@ import { import { getCouchInfo } from "./connections" import { directCouchUrlCall } from "./utils" import { getPouchDB } from "./pouchDB" -import { WriteStream, ReadStream } from "fs" +import { ReadStream, WriteStream } from "fs" import { newid } from "../../docIds/newid" import { SQLITE_DESIGN_DOC_ID } from "../../constants" import { DDInstrumentedDatabase } from "../instrumentation" @@ -38,6 +38,39 @@ function buildNano(couchInfo: { url: string; cookie: string }) { type DBCall = () => Promise +class CouchDBError extends Error { + status: number + statusCode: number + reason: string + name: string + errid: string + error: string + description: string + + constructor( + message: string, + info: { + status: number | undefined + statusCode: number | undefined + name: string + errid: string + description: string + reason: string + error: string + } + ) { + super(message) + const statusCode = info.status || info.statusCode || 500 + this.status = statusCode + this.statusCode = statusCode + this.reason = info.reason + this.name = info.name + this.errid = info.errid + this.description = info.description + this.error = info.error + } +} + export function DatabaseWithConnection( dbName: string, connection: string, @@ -119,7 +152,7 @@ export class DatabaseImpl implements Database { } catch (err: any) { // Handling race conditions if (err.statusCode !== 412) { - throw err + throw new CouchDBError(err.message, err) } } } @@ -138,10 +171,9 @@ export class DatabaseImpl implements Database { if (err.statusCode === 404 && err.reason === DATABASE_NOT_FOUND) { await this.checkAndCreateDb() return await this.performCall(call) - } else if (err.statusCode) { - err.status = err.statusCode } - throw err + // stripping the error down the props which are safe/useful, drop everything else + throw new CouchDBError(`CouchDB error: ${err.message}`, err) } } @@ -288,7 +320,7 @@ export class DatabaseImpl implements Database { if (err.statusCode === 404) { return } else { - throw { ...err, status: err.statusCode } + throw new CouchDBError(err.message, err) } } } diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts index d9dddd0097..f5ad7e6433 100644 --- a/packages/backend-core/src/db/lucene.ts +++ b/packages/backend-core/src/db/lucene.ts @@ -12,6 +12,10 @@ import { dataFilters } from "@budibase/shared-core" export const removeKeyNumbering = dataFilters.removeKeyNumbering +function isEmpty(value: any) { + return value == null || value === "" +} + /** * Class to build lucene query URLs. * Optionally takes a base lucene query object. @@ -282,15 +286,14 @@ export class QueryBuilder { } const equal = (key: string, value: any) => { - // 0 evaluates to false, which means we would return all rows if we don't check it - if (!value && value !== 0) { + if (isEmpty(value)) { return null } return `${key}:${builder.preprocess(value, allPreProcessingOpts)}` } const contains = (key: string, value: any, mode = "AND") => { - if (!value || (Array.isArray(value) && value.length === 0)) { + if (isEmpty(value)) { return null } if (!Array.isArray(value)) { @@ -306,7 +309,7 @@ export class QueryBuilder { } const fuzzy = (key: string, value: any) => { - if (!value) { + if (isEmpty(value)) { return null } value = builder.preprocess(value, { @@ -328,7 +331,7 @@ export class QueryBuilder { } const oneOf = (key: string, value: any) => { - if (!value) { + if (isEmpty(value)) { return `*:*` } if (!Array.isArray(value)) { @@ -386,7 +389,7 @@ export class QueryBuilder { // Construct the actual lucene search query string from JSON structure if (this.#query.string) { build(this.#query.string, (key: string, value: any) => { - if (!value) { + if (isEmpty(value)) { return null } value = builder.preprocess(value, { @@ -399,7 +402,7 @@ export class QueryBuilder { } if (this.#query.range) { build(this.#query.range, (key: string, value: any) => { - if (!value) { + if (isEmpty(value)) { return null } if (value.low == null || value.low === "") { @@ -421,7 +424,7 @@ export class QueryBuilder { } if (this.#query.notEqual) { build(this.#query.notEqual, (key: string, value: any) => { - if (!value) { + if (isEmpty(value)) { return null } if (typeof value === "boolean") { @@ -431,10 +434,28 @@ export class QueryBuilder { }) } if (this.#query.empty) { - build(this.#query.empty, (key: string) => `(*:* -${key}:["" TO *])`) + build(this.#query.empty, (key: string) => { + // Because the structure of an empty filter looks like this: + // { empty: { someKey: null } } + // + // The check inside of `build` does not set `allFiltersEmpty`, which results + // in weird behaviour when the empty filter is the only filter. We get around + // this by setting `allFiltersEmpty` to false here. + allFiltersEmpty = false + return `(*:* -${key}:["" TO *])` + }) } if (this.#query.notEmpty) { - build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`) + build(this.#query.notEmpty, (key: string) => { + // Because the structure of a notEmpty filter looks like this: + // { notEmpty: { someKey: null } } + // + // The check inside of `build` does not set `allFiltersEmpty`, which results + // in weird behaviour when the empty filter is the only filter. We get around + // this by setting `allFiltersEmpty` to false here. + allFiltersEmpty = false + return `${key}:["" TO *]` + }) } if (this.#query.oneOf) { build(this.#query.oneOf, oneOf) diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts index 69dba27c43..51cd4ec2af 100644 --- a/packages/backend-core/src/middleware/authenticated.ts +++ b/packages/backend-core/src/middleware/authenticated.ts @@ -13,7 +13,7 @@ import { getGlobalDB, doInTenant } from "../context" import { decrypt } from "../security/encryption" import * as identity from "../context/identity" import env from "../environment" -import { Ctx, EndpointMatcher, SessionCookie } from "@budibase/types" +import { Ctx, EndpointMatcher, SessionCookie, User } from "@budibase/types" import { InvalidAPIKeyError, ErrorCode } from "../errors" import tracer from "dd-trace" @@ -41,7 +41,10 @@ function finalise(ctx: any, opts: FinaliseOpts = {}) { ctx.version = opts.version } -async function checkApiKey(apiKey: string, populateUser?: Function) { +async function checkApiKey( + apiKey: string, + populateUser?: (userId: string, tenantId: string) => Promise +) { // check both the primary and the fallback internal api keys // this allows for rotation if (isValidInternalAPIKey(apiKey)) { @@ -128,6 +131,7 @@ export default function ( } else { user = await getUser(userId, session.tenantId) } + // @ts-ignore user.csrfToken = session.csrfToken if (session?.lastAccessedAt < timeMinusOneMinute()) { @@ -167,19 +171,25 @@ export default function ( authenticated = false } - if (user) { + const isUser = ( + user: any + ): user is User & { budibaseAccess?: string } => { + return user && user.email + } + + if (isUser(user)) { tracer.setUser({ - id: user?._id, - tenantId: user?.tenantId, - budibaseAccess: user?.budibaseAccess, - status: user?.status, + id: user._id!, + tenantId: user.tenantId, + budibaseAccess: user.budibaseAccess, + status: user.status, }) } // isAuthenticated is a function, so use a variable to be able to check authed state finalise(ctx, { authenticated, user, internal, version, publicEndpoint }) - if (user && user.email) { + if (isUser(user)) { return identity.doInUserContext(user, ctx, next) } else { return next() diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts index aa5365c5c3..0ac2c35179 100644 --- a/packages/backend-core/src/objectStore/objectStore.ts +++ b/packages/backend-core/src/objectStore/objectStore.ts @@ -13,13 +13,14 @@ import { bucketTTLConfig, budibaseTempDir } from "./utils" import { v4 } from "uuid" import { APP_PREFIX, APP_DEV_PREFIX } from "../db" import fsp from "fs/promises" +import { HeadObjectOutput } from "aws-sdk/clients/s3" const streamPipeline = promisify(stream.pipeline) // use this as a temporary store of buckets that are being created const STATE = { bucketCreationPromises: {}, } -const signedFilePrefix = "/files/signed" +export const SIGNED_FILE_PREFIX = "/files/signed" type ListParams = { ContinuationToken?: string @@ -40,8 +41,13 @@ type UploadParams = BaseUploadParams & { path?: string | PathLike } -type StreamUploadParams = BaseUploadParams & { - stream: ReadStream +export type StreamTypes = + | ReadStream + | NodeJS.ReadableStream + | ReadableStream + +export type StreamUploadParams = BaseUploadParams & { + stream?: StreamTypes } const CONTENT_TYPE_MAP: any = { @@ -83,7 +89,7 @@ export function ObjectStore( bucket: string, opts: { presigning: boolean } = { presigning: false } ) { - const config: any = { + const config: AWS.S3.ClientConfiguration = { s3ForcePathStyle: true, signatureVersion: "v4", apiVersion: "2006-03-01", @@ -174,11 +180,9 @@ export async function upload({ const objectStore = ObjectStore(bucketName) const bucketCreated = await createBucketIfNotExists(objectStore, bucketName) - if (ttl && (bucketCreated.created || bucketCreated.exists)) { + if (ttl && bucketCreated.created) { let ttlConfig = bucketTTLConfig(bucketName, ttl) - if (objectStore.putBucketLifecycleConfiguration) { - await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() - } + await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() } let contentType = type @@ -222,11 +226,9 @@ export async function streamUpload({ const objectStore = ObjectStore(bucketName) const bucketCreated = await createBucketIfNotExists(objectStore, bucketName) - if (ttl && (bucketCreated.created || bucketCreated.exists)) { + if (ttl && bucketCreated.created) { let ttlConfig = bucketTTLConfig(bucketName, ttl) - if (objectStore.putBucketLifecycleConfiguration) { - await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() - } + await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() } // Set content type for certain known extensions @@ -333,7 +335,7 @@ export function getPresignedUrl( const signedUrl = new URL(url) const path = signedUrl.pathname const query = signedUrl.search - return `${signedFilePrefix}${path}${query}` + return `${SIGNED_FILE_PREFIX}${path}${query}` } } @@ -521,6 +523,26 @@ export async function getReadStream( return client.getObject(params).createReadStream() } +export async function getObjectMetadata( + bucket: string, + path: string +): Promise { + bucket = sanitizeBucket(bucket) + path = sanitizeKey(path) + + const client = ObjectStore(bucket) + const params = { + Bucket: bucket, + Key: path, + } + + try { + return await client.headObject(params).promise() + } catch (err: any) { + throw new Error("Unable to retrieve metadata from object") + } +} + /* Given a signed url like '/files/signed/tmp-files-attachments/app_123456/myfile.txt' extract the bucket and the path from it @@ -530,7 +552,9 @@ export function extractBucketAndPath( ): { bucket: string; path: string } | null { const baseUrl = url.split("?")[0] - const regex = new RegExp(`^${signedFilePrefix}/(?[^/]+)/(?.+)$`) + const regex = new RegExp( + `^${SIGNED_FILE_PREFIX}/(?[^/]+)/(?.+)$` + ) const match = baseUrl.match(regex) if (match && match.groups) { diff --git a/packages/backend-core/src/objectStore/utils.ts b/packages/backend-core/src/objectStore/utils.ts index 08b5238ff6..5b9c2e3646 100644 --- a/packages/backend-core/src/objectStore/utils.ts +++ b/packages/backend-core/src/objectStore/utils.ts @@ -1,9 +1,14 @@ -import { join } from "path" +import path, { join } from "path" import { tmpdir } from "os" import fs from "fs" import env from "../environment" import { PutBucketLifecycleConfigurationRequest } from "aws-sdk/clients/s3" - +import * as objectStore from "./objectStore" +import { + AutomationAttachment, + AutomationAttachmentContent, + BucketedContent, +} from "@budibase/types" /**************************************************** * NOTE: When adding a new bucket - name * * sure that S3 usages (like budibase-infra) * @@ -55,3 +60,50 @@ export const bucketTTLConfig = ( return params } + +async function processUrlAttachment( + attachment: AutomationAttachment +): Promise { + const response = await fetch(attachment.url) + if (!response.ok || !response.body) { + throw new Error(`Unexpected response ${response.statusText}`) + } + const fallbackFilename = path.basename(new URL(attachment.url).pathname) + return { + filename: attachment.filename || fallbackFilename, + content: response.body, + } +} + +export async function processObjectStoreAttachment( + attachment: AutomationAttachment +): Promise { + const result = objectStore.extractBucketAndPath(attachment.url) + + if (result === null) { + throw new Error("Invalid signed URL") + } + + const { bucket, path: objectPath } = result + const readStream = await objectStore.getReadStream(bucket, objectPath) + const fallbackFilename = path.basename(objectPath) + return { + bucket, + path: objectPath, + filename: attachment.filename || fallbackFilename, + content: readStream, + } +} + +export async function processAutomationAttachment( + attachment: AutomationAttachment +): Promise { + const isFullyFormedUrl = + attachment.url?.startsWith("http://") || + attachment.url?.startsWith("https://") + if (isFullyFormedUrl) { + return await processUrlAttachment(attachment) + } else { + return await processObjectStoreAttachment(attachment) + } +} diff --git a/packages/backend-core/tests/core/utilities/index.ts b/packages/backend-core/tests/core/utilities/index.ts index b2f19a0286..787d69be2c 100644 --- a/packages/backend-core/tests/core/utilities/index.ts +++ b/packages/backend-core/tests/core/utilities/index.ts @@ -4,6 +4,3 @@ export { generator } from "./structures" export * as testContainerUtils from "./testContainerUtils" export * as utils from "./utils" export * from "./jestUtils" -import * as minio from "./minio" - -export const objectStoreTestProviders = { minio } diff --git a/packages/backend-core/tests/core/utilities/minio.ts b/packages/backend-core/tests/core/utilities/minio.ts deleted file mode 100644 index cef33daa91..0000000000 --- a/packages/backend-core/tests/core/utilities/minio.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { GenericContainer, Wait, StartedTestContainer } from "testcontainers" -import { AbstractWaitStrategy } from "testcontainers/build/wait-strategies/wait-strategy" -import env from "../../../src/environment" - -let container: StartedTestContainer | undefined - -class ObjectStoreWaitStrategy extends AbstractWaitStrategy { - async waitUntilReady(container: any, boundPorts: any, startTime?: Date) { - const logs = Wait.forListeningPorts() - await logs.waitUntilReady(container, boundPorts, startTime) - } -} - -export async function start(): Promise { - container = await new GenericContainer("minio/minio") - .withExposedPorts(9000) - .withCommand(["server", "/data"]) - .withEnvironment({ - MINIO_ACCESS_KEY: "budibase", - MINIO_SECRET_KEY: "budibase", - }) - .withWaitStrategy(new ObjectStoreWaitStrategy().withStartupTimeout(30000)) - .start() - - const port = container.getMappedPort(9000) - env._set("MINIO_URL", `http://0.0.0.0:${port}`) -} - -export async function stop() { - if (container) { - await container.stop() - container = undefined - } -} diff --git a/packages/backend-core/tests/core/utilities/testContainerUtils.ts b/packages/backend-core/tests/core/utilities/testContainerUtils.ts index d0dd2c9b4d..1a25bb28f4 100644 --- a/packages/backend-core/tests/core/utilities/testContainerUtils.ts +++ b/packages/backend-core/tests/core/utilities/testContainerUtils.ts @@ -28,7 +28,11 @@ function getTestcontainers(): ContainerInfo[] { .split("\n") .filter(x => x.length > 0) .map(x => JSON.parse(x) as ContainerInfo) - .filter(x => x.Labels.includes("org.testcontainers=true")) + .filter( + x => + x.Labels.includes("org.testcontainers=true") && + x.Labels.includes("com.budibase=true") + ) } export function getContainerByImage(image: string) { @@ -82,10 +86,18 @@ export function setupEnv(...envs: any[]) { throw new Error("CouchDB SQL port not found") } + const minio = getContainerByImage("minio/minio") + + const minioPort = getExposedV4Port(minio, 9000) + if (!minioPort) { + throw new Error("Minio port not found") + } + const configs = [ { key: "COUCH_DB_PORT", value: `${couchPort}` }, { key: "COUCH_DB_URL", value: `http://127.0.0.1:${couchPort}` }, { key: "COUCH_DB_SQL_URL", value: `http://127.0.0.1:${couchSqlPort}` }, + { key: "MINIO_URL", value: `http://127.0.0.1:${minioPort}` }, ] for (const config of configs.filter(x => !!x.value)) { diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a1baa2a38b..1b3510cf3b 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -43,6 +43,7 @@ "@spectrum-css/avatar": "3.0.2", "@spectrum-css/button": "3.0.1", "@spectrum-css/buttongroup": "3.0.2", + "@spectrum-css/calendar": "3.2.7", "@spectrum-css/checkbox": "3.0.2", "@spectrum-css/dialog": "3.0.1", "@spectrum-css/divider": "1.0.3", @@ -82,7 +83,6 @@ "dayjs": "^1.10.8", "easymde": "^2.16.1", "svelte-dnd-action": "^0.9.8", - "svelte-flatpickr": "3.2.3", "svelte-portal": "^1.0.0" }, "resolutions": { diff --git a/packages/bbui/src/ActionMenu/ActionMenu.svelte b/packages/bbui/src/ActionMenu/ActionMenu.svelte index c55d1cb43d..75ddd679da 100644 --- a/packages/bbui/src/ActionMenu/ActionMenu.svelte +++ b/packages/bbui/src/ActionMenu/ActionMenu.svelte @@ -38,7 +38,15 @@
- + diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index eafca657f3..124f43ff04 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,13 +1,24 @@ +// These class names will never trigger a callback if clicked, no matter what const ignoredClasses = [ - ".flatpickr-calendar", - ".spectrum-Popover", ".download-js-link", + ".spectrum-Menu", + ".date-time-popover", +] + +// These class names will only trigger a callback when clicked if the registered +// component is not nested inside them. For example, clicking inside a modal +// will not close the modal, or clicking inside a popover will not close the +// popover. +const conditionallyIgnoredClasses = [ + ".spectrum-Underlay", + ".drawer-wrapper", + ".spectrum-Popover", ] let clickHandlers = [] +let candidateTarget -/** - * Handle a body click event - */ +// Processes a "click outside" event and invokes callbacks if our source element +// is valid const handleClick = event => { // Ignore click if this is an ignored class if (event.target.closest('[data-ignore-click-outside="true"]')) { @@ -21,41 +32,60 @@ const handleClick = event => { // Process handlers clickHandlers.forEach(handler => { + // Check that the click isn't inside the target if (handler.element.contains(event.target)) { return } - // Ignore clicks for modals, unless the handler is registered from a modal - const sourceInModal = handler.anchor.closest(".spectrum-Underlay") != null - const clickInModal = event.target.closest(".spectrum-Underlay") != null - if (clickInModal && !sourceInModal) { - return - } - - // Ignore clicks for drawers, unless the handler is registered from a drawer - const sourceInDrawer = handler.anchor.closest(".drawer-wrapper") != null - const clickInDrawer = event.target.closest(".drawer-wrapper") != null - if (clickInDrawer && !sourceInDrawer) { - return - } - - if (handler.allowedType && event.type !== handler.allowedType) { - return + // Ignore clicks for certain classes unless we're nested inside them + for (let className of conditionallyIgnoredClasses) { + const sourceInside = handler.anchor.closest(className) != null + const clickInside = event.target.closest(className) != null + if (clickInside && !sourceInside) { + return + } } handler.callback?.(event) }) } -document.documentElement.addEventListener("click", handleClick, true) -document.documentElement.addEventListener("mousedown", handleClick, true) + +// On mouse up we only trigger a "click outside" callback if we targetted the +// same element that we did on mouse down. This fixes all sorts of issues where +// we get annoying callbacks firing when we drag to select text. +const handleMouseUp = e => { + if (candidateTarget === e.target) { + handleClick(e) + } + candidateTarget = null +} + +// On mouse down we store which element was targetted for comparison later +const handleMouseDown = e => { + // Only handle the primary mouse button here. + // We handle context menu (right click) events in another handler. + if (e.button !== 0) { + return + } + candidateTarget = e.target + + // Clear any previous listeners in case of multiple down events, and register + // a single mouse up listener + document.removeEventListener("mouseup", handleMouseUp) + document.addEventListener("mouseup", handleMouseUp, true) +} + +// Global singleton listeners for our events +document.addEventListener("mousedown", handleMouseDown) +document.addEventListener("contextmenu", handleClick) /** * Adds or updates a click handler */ -const updateHandler = (id, element, anchor, callback, allowedType) => { +const updateHandler = (id, element, anchor, callback) => { let existingHandler = clickHandlers.find(x => x.id === id) if (!existingHandler) { - clickHandlers.push({ id, element, anchor, callback, allowedType }) + clickHandlers.push({ id, element, anchor, callback }) } else { existingHandler.callback = callback } @@ -82,8 +112,7 @@ export default (element, opts) => { const callback = newOpts?.callback || (typeof newOpts === "function" ? newOpts : null) const anchor = newOpts?.anchor || element - const allowedType = newOpts?.allowedType || "click" - updateHandler(id, element, anchor, callback, allowedType) + updateHandler(id, element, anchor, callback) } update(opts) return { diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index 770d1bd507..6c4fcab757 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -1,3 +1,22 @@ +/** + * Valid alignment options are + * - left + * - right + * - left-outside + * - right-outside + **/ + +// Strategies are defined as [Popover]To[Anchor]. +// They can apply for both horizontal and vertical alignment. +const Strategies = { + StartToStart: "StartToStart", // e.g. left alignment + EndToEnd: "EndToEnd", // e.g. right alignment + StartToEnd: "StartToEnd", // e.g. right-outside alignment + EndToStart: "EndToStart", // e.g. left-outside alignment + MidPoint: "MidPoint", // centers relative to midpoints + ScreenEdge: "ScreenEdge", // locks to screen edge +} + export default function positionDropdown(element, opts) { let resizeObserver let latestOpts = opts @@ -19,6 +38,8 @@ export default function positionDropdown(element, opts) { useAnchorWidth, offset = 5, customUpdate, + resizable, + wrap, } = opts if (!anchor) { return @@ -27,56 +48,159 @@ export default function positionDropdown(element, opts) { // Compute bounds const anchorBounds = anchor.getBoundingClientRect() const elementBounds = element.getBoundingClientRect() + const winWidth = window.innerWidth + const winHeight = window.innerHeight + const screenOffset = 8 let styles = { - maxHeight: null, - minWidth, - maxWidth, + maxHeight, + minWidth: useAnchorWidth ? anchorBounds.width : minWidth, + maxWidth: useAnchorWidth ? anchorBounds.width : maxWidth, left: null, top: null, } + // Ignore all our logic for custom logic if (typeof customUpdate === "function") { styles = customUpdate(anchorBounds, elementBounds, { ...styles, offset: opts.offset, }) - } else { - // Determine vertical styles - if (align === "right-outside" || align === "left-outside") { - styles.top = - anchorBounds.top + anchorBounds.height / 2 - elementBounds.height / 2 - styles.maxHeight = maxHeight - if (styles.top + elementBounds.height > window.innerHeight) { - styles.top = window.innerHeight - elementBounds.height - } - } else if ( - window.innerHeight - anchorBounds.bottom < - (maxHeight || 100) - ) { - styles.top = anchorBounds.top - elementBounds.height - offset - styles.maxHeight = maxHeight || 240 - } else { - styles.top = anchorBounds.bottom + offset - styles.maxHeight = - maxHeight || window.innerHeight - anchorBounds.bottom - 20 + } + + // Otherwise position ourselves as normal + else { + // Checks if we overflow off the screen. We only report that we overflow + // when the alternative dimension is larger than the one we are checking. + const doesXOverflow = () => { + const overflows = styles.left + elementBounds.width > winWidth + return overflows && anchorBounds.left > winWidth - anchorBounds.right + } + const doesYOverflow = () => { + const overflows = styles.top + elementBounds.height > winHeight + return overflows && anchorBounds.top > winHeight - anchorBounds.bottom } - // Determine horizontal styles - if (!maxWidth && useAnchorWidth) { - styles.maxWidth = anchorBounds.width + // Applies a dynamic max height constraint if appropriate + const applyMaxHeight = height => { + if (!styles.maxHeight && resizable) { + styles.maxHeight = height + } } - if (useAnchorWidth) { - styles.minWidth = anchorBounds.width + + // Applies the X strategy to our styles + const applyXStrategy = strategy => { + switch (strategy) { + case Strategies.StartToStart: + default: + styles.left = anchorBounds.left + break + case Strategies.EndToEnd: + styles.left = anchorBounds.right - elementBounds.width + break + case Strategies.StartToEnd: + styles.left = anchorBounds.right + offset + break + case Strategies.EndToStart: + styles.left = anchorBounds.left - elementBounds.width - offset + break + case Strategies.MidPoint: + styles.left = + anchorBounds.left + + anchorBounds.width / 2 - + elementBounds.width / 2 + break + case Strategies.ScreenEdge: + styles.left = winWidth - elementBounds.width - screenOffset + break + } } + + // Applies the Y strategy to our styles + const applyYStrategy = strategy => { + switch (strategy) { + case Strategies.StartToStart: + styles.top = anchorBounds.top + applyMaxHeight(winHeight - anchorBounds.top - screenOffset) + break + case Strategies.EndToEnd: + styles.top = anchorBounds.bottom - elementBounds.height + applyMaxHeight(anchorBounds.bottom - screenOffset) + break + case Strategies.StartToEnd: + default: + styles.top = anchorBounds.bottom + offset + applyMaxHeight(winHeight - anchorBounds.bottom - screenOffset) + break + case Strategies.EndToStart: + styles.top = anchorBounds.top - elementBounds.height - offset + applyMaxHeight(anchorBounds.top - screenOffset) + break + case Strategies.MidPoint: + styles.top = + anchorBounds.top + + anchorBounds.height / 2 - + elementBounds.height / 2 + break + case Strategies.ScreenEdge: + styles.top = winHeight - elementBounds.height - screenOffset + applyMaxHeight(winHeight - 2 * screenOffset) + break + } + } + + // Determine X strategy if (align === "right") { - styles.left = - anchorBounds.left + anchorBounds.width - elementBounds.width + applyXStrategy(Strategies.EndToEnd) } else if (align === "right-outside") { - styles.left = anchorBounds.right + offset + applyXStrategy(Strategies.StartToEnd) } else if (align === "left-outside") { - styles.left = anchorBounds.left - elementBounds.width - offset + applyXStrategy(Strategies.EndToStart) } else { - styles.left = anchorBounds.left + applyXStrategy(Strategies.StartToStart) + } + + // Determine Y strategy + if (align === "right-outside" || align === "left-outside") { + applyYStrategy(Strategies.MidPoint) + } else { + applyYStrategy(Strategies.StartToEnd) + } + + // Handle screen overflow + if (doesXOverflow()) { + // Swap left to right + if (align === "left") { + applyXStrategy(Strategies.EndToEnd) + } + // Swap right-outside to left-outside + else if (align === "right-outside") { + applyXStrategy(Strategies.EndToStart) + } + } + if (doesYOverflow()) { + // If wrapping, lock to the bottom of the screen and also reposition to + // the side to not block the anchor + if (wrap) { + applyYStrategy(Strategies.MidPoint) + if (doesYOverflow()) { + applyYStrategy(Strategies.ScreenEdge) + } + applyXStrategy(Strategies.StartToEnd) + if (doesXOverflow()) { + applyXStrategy(Strategies.EndToStart) + } + } + // Othewise invert as normal + else { + // If using an outside strategy then lock to the bottom of the screen + if (align === "left-outside" || align === "right-outside") { + applyYStrategy(Strategies.ScreenEdge) + } + // Otherwise flip above + else { + applyYStrategy(Strategies.EndToStart) + } + } } } diff --git a/packages/bbui/src/Banner/Banner.svelte b/packages/bbui/src/Banner/Banner.svelte index a04d469cc7..2ce9795d70 100644 --- a/packages/bbui/src/Banner/Banner.svelte +++ b/packages/bbui/src/Banner/Banner.svelte @@ -8,6 +8,8 @@ export let size = "S" export let extraButtonText export let extraButtonAction + export let extraLinkText + export let extraLinkAction export let showCloseButton = true let show = true @@ -28,8 +30,13 @@
-
+
+ {#if extraLinkText} + + {/if}
{#if extraButtonText && extraButtonAction} -
- -{/key} -{#if open} - -
-{/if} - - diff --git a/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte b/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte new file mode 100644 index 0000000000..d7056db6d6 --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/Calendar.svelte @@ -0,0 +1,252 @@ + + +
+
+
+
+ +
+ {#if !disabled && !readonly} + + {/if} +
+ + diff --git a/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte new file mode 100644 index 0000000000..f5189c9edd --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/DatePicker.svelte @@ -0,0 +1,83 @@ + + + + + + {#if isOpen} + + {/if} + diff --git a/packages/bbui/src/Form/Core/DatePicker/DatePickerPopoverContents.svelte b/packages/bbui/src/Form/Core/DatePicker/DatePickerPopoverContents.svelte new file mode 100644 index 0000000000..f1bb809b29 --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/DatePickerPopoverContents.svelte @@ -0,0 +1,102 @@ + + +
+ {#if showCalendar} + handleChange(e.detail)} + bind:this={calendar} + /> + {/if} +
+ {#if showTime} + handleChange(e.detail)} /> + {/if} +
+ dispatch("change", null)} + > + Clear + + + {showTime ? "Now" : "Today"} + +
+
+
+ + diff --git a/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte b/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte new file mode 100644 index 0000000000..dc4886d28d --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte @@ -0,0 +1,54 @@ + + + + + diff --git a/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte b/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte new file mode 100644 index 0000000000..047e5a4f08 --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte @@ -0,0 +1,59 @@ + + +
+ + : + +
+ + diff --git a/packages/bbui/src/Form/Core/DatePicker/utils.js b/packages/bbui/src/Form/Core/DatePicker/utils.js new file mode 100644 index 0000000000..953c3eb6c0 --- /dev/null +++ b/packages/bbui/src/Form/Core/DatePicker/utils.js @@ -0,0 +1,14 @@ +export const cleanInput = ({ max, pad, fallback }) => { + return e => { + if (e.target.value) { + const value = parseInt(e.target.value) + if (isNaN(value)) { + e.target.value = fallback + } else { + e.target.value = Math.min(max, value).toString().padStart(pad, "0") + } + } else { + e.target.value = fallback + } + } +} diff --git a/packages/bbui/src/Form/Core/DateRangePicker.svelte b/packages/bbui/src/Form/Core/DateRangePicker.svelte new file mode 100644 index 0000000000..9084942ba7 --- /dev/null +++ b/packages/bbui/src/Form/Core/DateRangePicker.svelte @@ -0,0 +1,69 @@ + + +
+ (fromDate = e.detail)} + enableTime={false} + /> +
+ +
+ (toDate = e.detail)} + enableTime={false} + /> +
+ + diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index f6bffbbf10..eb7a5db655 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -155,6 +155,7 @@ useAnchorWidth={!autoWidth} maxWidth={autoWidth ? 400 : null} customHeight={customPopoverHeight} + maxHeight={240} >
import Field from "./Field.svelte" - import DatePicker from "./Core/DatePicker.svelte" + import DatePicker from "./Core/DatePicker/DatePicker.svelte" import { createEventDispatcher } from "svelte" export let value = null @@ -11,22 +11,15 @@ export let error = null export let enableTime = true export let timeOnly = false - export let time24hr = false export let placeholder = null export let appendTo = undefined export let ignoreTimezones = false - export let range = false export let helpText = null + const dispatch = createEventDispatcher() const onChange = e => { - if (range) { - // Flatpickr cant take two dates and work out what to display, needs to be provided a string. - // Like - "Date1 to Date2". Hence passing in that specifically from the array - value = e?.detail[1] - } else { - value = e.detail - } + value = e.detail dispatch("change", e.detail) } @@ -40,10 +33,8 @@ {placeholder} {enableTime} {timeOnly} - {time24hr} {appendTo} {ignoreTimezones} - {range} on:change={onChange} /> diff --git a/packages/bbui/src/Form/DateRangePicker.svelte b/packages/bbui/src/Form/DateRangePicker.svelte new file mode 100644 index 0000000000..39c2acb96a --- /dev/null +++ b/packages/bbui/src/Form/DateRangePicker.svelte @@ -0,0 +1,34 @@ + + + + + diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 2169a12459..62dd9cc909 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -7,11 +7,11 @@ export let narrower = false export let noPadding = false - let sidePanelVisble = false + let sidePanelVisible = false setContext("side-panel", { - open: () => (sidePanelVisble = true), - close: () => (sidePanelVisble = false), + open: () => (sidePanelVisible = true), + close: () => (sidePanelVisible = false), }) @@ -24,9 +24,9 @@
{ - sidePanelVisble = false + sidePanelVisible = false }} > diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index c51af48300..aa811afe1e 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -18,13 +18,15 @@ export let open = false export let useAnchorWidth = false export let dismissible = true - export let offset = 5 + export let offset = 4 export let customHeight export let animate = true export let customZindex export let handlePostionUpdate export let showPopover = true export let clickOutsideOverride = false + export let resizable = true + export let wrap = false $: target = portalTarget || getContext(Context.PopoverRoot) || ".spectrum" @@ -91,6 +93,8 @@ useAnchorWidth, offset, customUpdate: handlePostionUpdate, + resizable, + wrap, }} use:clickOutside={{ callback: dismissible ? handleOutsideClick : () => {}, @@ -116,12 +120,11 @@ min-width: var(--spectrum-global-dimension-size-2000); border-color: var(--spectrum-global-color-gray-300); overflow: auto; - transition: opacity 260ms ease-out, transform 260ms ease-out; + transition: opacity 260ms ease-out; } .hidden { opacity: 0; pointer-events: none; - transform: translateY(-20px); } .customZindex { z-index: var(--customZindex) !important; diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js index abb7c9a8aa..90b447f3c1 100644 --- a/packages/bbui/src/helpers.js +++ b/packages/bbui/src/helpers.js @@ -1,4 +1,5 @@ import { helpers } from "@budibase/shared-core" +import dayjs from "dayjs" export const deepGet = helpers.deepGet @@ -115,3 +116,110 @@ export const copyToClipboard = value => { } }) } + +// Parsed a date value. This is usually an ISO string, but can be a +// bunch of different formats and shapes depending on schema flags. +export const parseDate = (value, { enableTime = true }) => { + // If empty then invalid + if (!value) { + return null + } + + // Certain string values need transformed + if (typeof value === "string") { + // Check for time only values + if (!isNaN(new Date(`0-${value}`))) { + value = `0-${value}` + } + + // If date only, check for cases where we received a UTC string + else if (!enableTime && value.endsWith("Z")) { + value = value.split("Z")[0] + } + } + + // Parse value and check for validity + const parsedDate = dayjs(value) + if (!parsedDate.isValid()) { + return null + } + + // By rounding to the nearest second we avoid locking up in an endless + // loop in the builder, caused by potentially enriching {{ now }} to every + // millisecond. + return dayjs(Math.floor(parsedDate.valueOf() / 1000) * 1000) +} + +// Stringifies a dayjs object to create an ISO string that respects the various +// schema flags +export const stringifyDate = ( + value, + { enableTime = true, timeOnly = false, ignoreTimezones = false } = {} +) => { + if (!value) { + return null + } + + // Time only fields always ignore timezones, otherwise they make no sense. + // For non-timezone-aware fields, create an ISO 8601 timestamp of the exact + // time picked, without timezone + const offsetForTimezone = (enableTime && ignoreTimezones) || timeOnly + if (offsetForTimezone) { + // Ensure we use the correct offset for the date + const referenceDate = timeOnly ? new Date() : value.toDate() + const offset = referenceDate.getTimezoneOffset() * 60000 + return new Date(value.valueOf() - offset).toISOString().slice(0, -1) + } + + // For date-only fields, construct a manual timestamp string without a time + // or time zone + else if (!enableTime) { + const year = value.year() + const month = `${value.month() + 1}`.padStart(2, "0") + const day = `${value.date()}`.padStart(2, "0") + return `${year}-${month}-${day}T00:00:00.000` + } + + // Otherwise use a normal ISO string with time and timezone + else { + return value.toISOString() + } +} + +// Determine the dayjs-compatible format of the browser's default locale +const getPatternForPart = part => { + switch (part.type) { + case "day": + return "D".repeat(part.value.length) + case "month": + return "M".repeat(part.value.length) + case "year": + return "Y".repeat(part.value.length) + case "literal": + return part.value + default: + console.log("Unsupported date part", part) + return "" + } +} +const localeDateFormat = new Intl.DateTimeFormat() + .formatToParts(new Date("2021-01-01")) + .map(getPatternForPart) + .join("") + +// Formats a dayjs date according to schema flags +export const getDateDisplayValue = ( + value, + { enableTime = true, timeOnly = false } = {} +) => { + if (!value?.isValid()) { + return "" + } + if (timeOnly) { + return value.format("HH:mm") + } else if (!enableTime) { + return value.format(localeDateFormat) + } else { + return value.format(`${localeDateFormat} HH:mm`) + } +} diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index d18c4d6910..f28e185305 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -3,13 +3,34 @@ import "./bbui.css" // Spectrum icons import "@spectrum-css/icon/dist/index-vars.css" -// Components +// Form components export { default as Input } from "./Form/Input.svelte" export { default as Stepper } from "./Form/Stepper.svelte" export { default as TextArea } from "./Form/TextArea.svelte" export { default as Select } from "./Form/Select.svelte" export { default as Combobox } from "./Form/Combobox.svelte" export { default as Dropzone } from "./Form/Dropzone.svelte" +export { default as DatePicker } from "./Form/DatePicker.svelte" +export { default as DateRangePicker } from "./Form/DateRangePicker.svelte" +export { default as Toggle } from "./Form/Toggle.svelte" +export { default as RadioGroup } from "./Form/RadioGroup.svelte" +export { default as Checkbox } from "./Form/Checkbox.svelte" +export { default as InputDropdown } from "./Form/InputDropdown.svelte" +export { default as PickerDropdown } from "./Form/PickerDropdown.svelte" +export { default as EnvDropdown } from "./Form/EnvDropdown.svelte" +export { default as Multiselect } from "./Form/Multiselect.svelte" +export { default as Search } from "./Form/Search.svelte" +export { default as RichTextField } from "./Form/RichTextField.svelte" +export { default as Slider } from "./Form/Slider.svelte" +export { default as File } from "./Form/File.svelte" + +// Core form components to be used elsewhere (standard components) +export * from "./Form/Core" + +// Fancy form components +export * from "./FancyForm" + +// Components export { default as Drawer } from "./Drawer/Drawer.svelte" export { default as DrawerContent } from "./Drawer/DrawerContent.svelte" export { default as Avatar } from "./Avatar/Avatar.svelte" @@ -21,12 +42,6 @@ export { default as ButtonGroup } from "./ButtonGroup/ButtonGroup.svelte" export { default as ClearButton } from "./ClearButton/ClearButton.svelte" export { default as Icon } from "./Icon/Icon.svelte" export { default as IconAvatar } from "./Icon/IconAvatar.svelte" -export { default as Toggle } from "./Form/Toggle.svelte" -export { default as RadioGroup } from "./Form/RadioGroup.svelte" -export { default as Checkbox } from "./Form/Checkbox.svelte" -export { default as InputDropdown } from "./Form/InputDropdown.svelte" -export { default as PickerDropdown } from "./Form/PickerDropdown.svelte" -export { default as EnvDropdown } from "./Form/EnvDropdown.svelte" export { default as DetailSummary } from "./DetailSummary/DetailSummary.svelte" export { default as Popover } from "./Popover/Popover.svelte" export { default as ProgressBar } from "./ProgressBar/ProgressBar.svelte" @@ -37,11 +52,6 @@ export { default as Page } from "./Layout/Page.svelte" export { default as Link } from "./Link/Link.svelte" export { default as Tooltip } from "./Tooltip/Tooltip.svelte" export { default as TempTooltip } from "./Tooltip/TempTooltip.svelte" -export { - default as AbsTooltip, - TooltipPosition, - TooltipType, -} from "./Tooltip/AbsTooltip.svelte" export { default as TooltipWrapper } from "./Tooltip/TooltipWrapper.svelte" export { default as Menu } from "./Menu/Menu.svelte" export { default as MenuSection } from "./Menu/Section.svelte" @@ -53,8 +63,6 @@ export { default as NotificationDisplay } from "./Notification/NotificationDispl export { default as Notification } from "./Notification/Notification.svelte" export { default as SideNavigation } from "./SideNavigation/Navigation.svelte" export { default as SideNavigationItem } from "./SideNavigation/Item.svelte" -export { default as DatePicker } from "./Form/DatePicker.svelte" -export { default as Multiselect } from "./Form/Multiselect.svelte" export { default as Context } from "./context" export { default as Table } from "./Table/Table.svelte" export { default as Tabs } from "./Tabs/Tabs.svelte" @@ -64,7 +72,6 @@ export { default as Tag } from "./Tags/Tag.svelte" export { default as TreeView } from "./TreeView/Tree.svelte" export { default as TreeItem } from "./TreeView/Item.svelte" export { default as Divider } from "./Divider/Divider.svelte" -export { default as Search } from "./Form/Search.svelte" export { default as Pagination } from "./Pagination/Pagination.svelte" export { default as Badge } from "./Badge/Badge.svelte" export { default as StatusLight } from "./StatusLight/StatusLight.svelte" @@ -76,15 +83,15 @@ export { default as CopyInput } from "./Input/CopyInput.svelte" export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte" export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte" export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte" -export { default as RichTextField } from "./Form/RichTextField.svelte" export { default as List } from "./List/List.svelte" export { default as ListItem } from "./List/ListItem.svelte" 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" export { default as OptionSelectDnD } from "./OptionSelectDnD/OptionSelectDnD.svelte" +export { default as AbsTooltip } from "./Tooltip/AbsTooltip.svelte" +export { TooltipPosition, TooltipType } from "./Tooltip/AbsTooltip.svelte" + // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" export { default as CodeRenderer } from "./Table/CodeRenderer.svelte" @@ -96,9 +103,6 @@ export { default as Heading } from "./Typography/Heading.svelte" export { default as Detail } from "./Typography/Detail.svelte" export { default as Code } from "./Typography/Code.svelte" -// Core form components to be used elsewhere (standard components) -export * from "./Form/Core" - // Actions export { default as autoResizeTextArea } from "./Actions/autoresize_textarea" export { default as positionDropdown } from "./Actions/position_dropdown" @@ -110,6 +114,3 @@ export { banner, BANNER_TYPES } from "./Stores/banner" // Helpers export * as Helpers from "./helpers" - -// Fancy form components -export * from "./FancyForm" diff --git a/packages/builder/assets/FreeTrial.svelte b/packages/builder/assets/FreeTrial.svelte new file mode 100644 index 0000000000..79a722d90c --- /dev/null +++ b/packages/builder/assets/FreeTrial.svelte @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 2d2022299c..85af5bbafd 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -48,6 +48,7 @@ import { TriggerStepID, ActionStepID } from "constants/backend/automations" import { onMount } from "svelte" import { cloneDeep } from "lodash/fp" + import { FIELDS } from "constants/backend" export let block export let testData @@ -228,6 +229,10 @@ categoryName, bindingName ) => { + const field = Object.values(FIELDS).find( + field => field.type === value.type && field.subtype === value.subtype + ) + return { readableBinding: bindingName ? `${bindingName}.${name}` @@ -238,7 +243,7 @@ icon, category: categoryName, display: { - type: value.type, + type: field?.name || value.type, name, rank: isLoopBlock ? idx + 1 : idx - loopBlockCount, }, @@ -282,6 +287,7 @@ for (const key in table?.schema) { schema[key] = { type: table.schema[key].type, + subtype: table.schema[key].subtype, } } // remove the original binding @@ -358,7 +364,8 @@ value.customType !== "cron" && value.customType !== "triggerSchema" && value.customType !== "automationFields" && - value.type !== "attachment" + value.type !== "attachment" && + value.type !== "attachment_single" ) } diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte index 0d15df6c87..ab020aad08 100644 --- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte @@ -2,6 +2,8 @@ import { tables } from "stores/builder" import { Select, Checkbox, Label } from "@budibase/bbui" import { createEventDispatcher } from "svelte" + import { FieldType } from "@budibase/types" + import RowSelectorTypes from "./RowSelectorTypes.svelte" import DrawerBindableSlot from "../../common/bindings/DrawerBindableSlot.svelte" import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte" @@ -14,7 +16,6 @@ export let bindings export let isTestModal export let isUpdateRow - $: parsedBindings = bindings.map(binding => { let clone = Object.assign({}, binding) clone.icon = "ShareAndroid" @@ -26,15 +27,19 @@ $: { table = $tables.list.find(table => table._id === value?.tableId) - schemaFields = Object.entries(table?.schema ?? {}) - // surface the schema so the user can see it in the json - schemaFields.map(([, schema]) => { + + // Just sorting attachment types to the bottom here for a cleaner UX + schemaFields = Object.entries(table?.schema ?? {}).sort( + ([, schemaA], [, schemaB]) => + (schemaA.type === "attachment") - (schemaB.type === "attachment") + ) + + schemaFields.forEach(([, schema]) => { if (!schema.autocolumn && !value[schema.name]) { value[schema.name] = "" } }) } - const onChangeTable = e => { value["tableId"] = e.detail dispatch("change", value) @@ -114,10 +119,16 @@
{#if schemaFields.length} {#each schemaFields as [field, schema]} - {#if !schema.autocolumn && schema.type !== "attachment"} -
+ {#if !schema.autocolumn} +
-
+
{#if isTestModal} import { Select, DatePicker, Multiselect, TextArea } from "@budibase/bbui" + import { FieldType } from "@budibase/types" import LinkedRowSelector from "components/common/LinkedRowSelector.svelte" import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte" import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte" import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte" import Editor from "components/integration/QueryEditor.svelte" + import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" export let onChange export let field @@ -22,6 +24,27 @@ function schemaHasOptions(schema) { return !!schema.constraints?.inclusion?.length } + + const handleAttachmentParams = keyValuObj => { + let params = {} + + if ( + schema.type === FieldType.ATTACHMENT_SINGLE && + Object.keys(keyValuObj).length === 0 + ) { + return [] + } + if (!Array.isArray(keyValuObj)) { + keyValuObj = [keyValuObj] + } + + if (keyValuObj.length) { + for (let param of keyValuObj) { + params[param.url] = param.filename + } + } + return params + } {#if schemaHasOptions(schema) && schema.type !== "array"} @@ -77,6 +100,35 @@ on:change={e => onChange(e, field)} useLabel={false} /> +{:else if schema.type === FieldType.ATTACHMENTS || schema.type === FieldType.ATTACHMENT_SINGLE} +
+ + onChange( + { + detail: + schema.type === FieldType.ATTACHMENT_SINGLE + ? e.detail.length > 0 + ? { url: e.detail[0].name, filename: e.detail[0].value } + : {} + : e.detail.map(({ name, value }) => ({ + url: name, + filename: value, + })), + }, + field + )} + object={handleAttachmentParams(value[field])} + allowJS + {bindings} + keyBindings + customButtonText={"Add attachment"} + keyPlaceholder={"URL"} + valuePlaceholder={"Filename"} + actionButtonDisabled={schema.type === FieldType.ATTACHMENT_SINGLE && + Object.keys(value[field]).length >= 1} + /> +
{:else if ["string", "number", "bigint", "barcodeqr", "array"].includes(schema.type)} {/if} + + diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte index 6a5cd2f282..77229f3a17 100644 --- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte @@ -106,6 +106,5 @@ display: flex; flex-direction: column; background: var(--background); - overflow: hidden; } diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte index e3937ab772..decf77069f 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte @@ -1,7 +1,9 @@ - + {text} - - dispatch("change", tempValue)} - > -
- (tempValue = e.detail)} - /> -
- - - + + + + (tempValue = e.detail)} + {bindings} + /> + + diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js index b339729391..c59fb9c536 100644 --- a/packages/builder/src/components/backend/DataTable/formula.js +++ b/packages/builder/src/components/backend/DataTable/formula.js @@ -55,7 +55,7 @@ export function getBindings({ ) } const field = Object.values(FIELDS).find( - field => field.type === schema.type + field => field.type === schema.type && field.subtype === schema.subtype ) const label = path == null ? column : `${path}.0.${column}` diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index d271462f3e..622da2173d 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -12,8 +12,13 @@ OptionSelectDnD, Layout, AbsTooltip, + ProgressCircle, } from "@budibase/bbui" - import { SWITCHABLE_TYPES, ValidColumnNameRegex } from "@budibase/shared-core" + import { + SWITCHABLE_TYPES, + ValidColumnNameRegex, + helpers, + } from "@budibase/shared-core" import { createEventDispatcher, getContext, onMount } from "svelte" import { cloneDeep } from "lodash/fp" import { tables, datasources } from "stores/builder" @@ -29,7 +34,11 @@ import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte" import { getBindings } from "components/backend/DataTable/formula" import JSONSchemaModal from "./JSONSchemaModal.svelte" - import { FieldType, FieldSubtype, SourceName } from "@budibase/types" + import { + BBReferenceFieldSubType, + FieldType, + SourceName, + } from "@budibase/types" import RelationshipSelector from "components/common/RelationshipSelector.svelte" import { RowUtils } from "@budibase/frontend-core" import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte" @@ -41,8 +50,6 @@ const NUMBER_TYPE = FieldType.NUMBER const JSON_TYPE = FieldType.JSON const DATE_TYPE = FieldType.DATETIME - const USER_TYPE = FieldSubtype.USER - const USERS_TYPE = FieldSubtype.USERS const dispatch = createEventDispatcher() const PROHIBITED_COLUMN_NAMES = ["type", "_id", "_rev", "tableId"] @@ -65,7 +72,6 @@ let savingColumn let deleteColName let jsonSchemaModal - let allowedTypes = [] let editableColumn = { type: FIELDS.STRING.type, constraints: FIELDS.STRING.constraints, @@ -173,6 +179,11 @@ SWITCHABLE_TYPES[field.type] && !editableColumn?.autocolumn) + $: allowedTypes = getAllowedTypes(datasource).map(t => ({ + fieldId: makeFieldId(t.type, t.subtype), + ...t, + })) + const fieldDefinitions = Object.values(FIELDS).reduce( // Storing the fields by complex field id (acc, field) => ({ @@ -186,7 +197,10 @@ // don't make field IDs for auto types if (type === AUTO_TYPE || autocolumn) { return type.toUpperCase() - } else if (type === FieldType.BB_REFERENCE) { + } else if ( + type === FieldType.BB_REFERENCE || + type === FieldType.BB_REFERENCE_SINGLE + ) { return `${type}${subtype || ""}`.toUpperCase() } else { return type.toUpperCase() @@ -224,11 +238,6 @@ editableColumn.subtype, editableColumn.autocolumn ) - - allowedTypes = getAllowedTypes().map(t => ({ - fieldId: makeFieldId(t.type, t.subtype), - ...t, - })) } } @@ -243,11 +252,11 @@ } async function saveColumn() { - savingColumn = true if (errors?.length) { return } + savingColumn = true let saveColumn = cloneDeep(editableColumn) delete saveColumn.fieldId @@ -262,13 +271,6 @@ if (saveColumn.type !== LINK_TYPE) { delete saveColumn.fieldName } - if (isUsersColumn(saveColumn)) { - if (saveColumn.subtype === USER_TYPE) { - saveColumn.relationshipType = RelationshipType.ONE_TO_MANY - } else if (saveColumn.subtype === USERS_TYPE) { - saveColumn.relationshipType = RelationshipType.MANY_TO_MANY - } - } try { await tables.saveField({ @@ -287,6 +289,8 @@ } } catch (err) { notifications.error(`Error saving column: ${err.message}`) + } finally { + savingColumn = false } } @@ -361,22 +365,36 @@ deleteColName = "" } - function getAllowedTypes() { + function getAllowedTypes(datasource) { if (originalName) { - const possibleTypes = ( - SWITCHABLE_TYPES[field.type] || [editableColumn.type] - ).map(t => t.toLowerCase()) + let possibleTypes = SWITCHABLE_TYPES[field.type] || [editableColumn.type] + if (helpers.schema.isDeprecatedSingleUserColumn(editableColumn)) { + // This will handle old single users columns + return [ + { + ...FIELDS.USER, + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + }, + ] + } else if ( + editableColumn.type === FieldType.BB_REFERENCE && + editableColumn.subtype === BBReferenceFieldSubType.USERS + ) { + // This will handle old multi users columns + return [ + { + ...FIELDS.USERS, + subtype: BBReferenceFieldSubType.USERS, + }, + ] + } + return Object.entries(FIELDS) - .filter(([fieldType]) => - possibleTypes.includes(fieldType.toLowerCase()) - ) + .filter(([_, field]) => possibleTypes.includes(field.type)) .map(([_, fieldDefinition]) => fieldDefinition) } - const isUsers = - editableColumn.type === FieldType.BB_REFERENCE && - editableColumn.subtype === FieldSubtype.USERS - if (!externalTable) { return [ FIELDS.STRING, @@ -393,7 +411,8 @@ FIELDS.LINK, FIELDS.FORMULA, FIELDS.JSON, - isUsers ? FIELDS.USERS : FIELDS.USER, + FIELDS.USER, + FIELDS.USERS, FIELDS.AUTO, ] } else { @@ -407,8 +426,12 @@ FIELDS.BOOLEAN, FIELDS.FORMULA, FIELDS.BIGINT, - isUsers ? FIELDS.USERS : FIELDS.USER, + FIELDS.USER, ] + + if (datasource && datasource.source !== SourceName.GOOGLE_SHEETS) { + fields.push(FIELDS.USERS) + } // no-sql or a spreadsheet if (!externalTable || table.sql) { fields = [...fields, FIELDS.LINK, FIELDS.ARRAY] @@ -482,13 +505,6 @@ return newError } - function isUsersColumn(column) { - return ( - column.type === FieldType.BB_REFERENCE && - [FieldSubtype.USER, FieldSubtype.USERS].includes(column.subtype) - ) - } - onMount(() => { mounted = true }) @@ -513,6 +529,7 @@ /> {/if} Delete {/if} - +
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte index 020c58d19f..2ecb7dfd59 100644 --- a/packages/builder/src/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte @@ -13,7 +13,9 @@ onMount(() => subscribe("edit-column", editColumn)) - +{#if editableColumn} + +{/if} diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte index 6901503071..318f459f46 100644 --- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte +++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte @@ -1,5 +1,5 @@ + +
+ + +
+ + diff --git a/packages/builder/src/components/common/RelationshipSelector.svelte b/packages/builder/src/components/common/RelationshipSelector.svelte index 63f0357a8f..5e840d4ffb 100644 --- a/packages/builder/src/components/common/RelationshipSelector.svelte +++ b/packages/builder/src/components/common/RelationshipSelector.svelte @@ -75,14 +75,12 @@ .relationship-container { display: flex; align-items: center; - gap: 20px; + gap: var(--spacing-m); } - .relationship-part { - flex-basis: 70%; + flex: 1 1 auto; } - .relationship-type { - flex-basis: 30%; + flex: 0 0 128px; } diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte index 8ce9dda209..fb448cca8d 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte @@ -4,6 +4,7 @@ readableToRuntimeBinding, runtimeToReadableBinding, } from "dataBinding" + import { FieldType } from "@budibase/types" import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte" import { createEventDispatcher, setContext } from "svelte" @@ -102,6 +103,8 @@ longform: value => !isJSBinding(value), json: value => !isJSBinding(value), boolean: isValidBoolean, + attachment: false, + attachment_single: false, } const isValid = value => { @@ -116,7 +119,16 @@ if (type === "json" && !isJSBinding(value)) { return "json-slot-icon" } - if (!["string", "number", "bigint", "barcodeqr"].includes(type)) { + if ( + ![ + "string", + "number", + "bigint", + "barcodeqr", + "attachment", + "attachment_single", + ].includes(type) + ) { return "slot-icon" } return "" @@ -157,7 +169,7 @@ {updateOnChange} /> {/if} - {#if !disabled && type !== "formula"} + {#if !disabled && type !== "formula" && !disabled && type !== FieldType.ATTACHMENTS && !disabled && type !== FieldType.ATTACHMENT_SINGLE}
{ diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte index 85d395e4f4..b808733d08 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte @@ -1,8 +1,10 @@ + + + + + + diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js index 34558e98e2..34b22c934b 100644 --- a/packages/builder/src/components/portal/licensing/licensingBanners.js +++ b/packages/builder/src/components/portal/licensing/licensingBanners.js @@ -12,7 +12,7 @@ const defaultCacheFn = key => { const upgradeAction = key => { return defaultNavigateAction( key, - "Upgrade Plan", + "Upgrade", `${get(admin).accountPortalUrl}/portal/upgrade` ) } diff --git a/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte new file mode 100644 index 0000000000..6652bd4104 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte @@ -0,0 +1,66 @@ + + + + { + if (get(auth).user) { + try { + await API.updateSelf({ + freeTrialConfirmedAt: new Date().toISOString(), + }) + // Update the cached user + await auth.getSelf() + } finally { + freeTrialModal.hide() + } + } + }} + > +

Experience all of Budibase with a free 14-day trial

+
+ We've upgraded you to a free 14-day trial that allows you to try all our + features before deciding which plan is right for you. +

+ At the end of your trial, we'll automatically downgrade you to the Free + plan unless you choose to upgrade. +

+
+ + + + + diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index 84975d93e2..75f6a053b5 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -1,6 +1,6 @@ import { FieldType, - FieldSubtype, + BBReferenceFieldSubType, INTERNAL_TABLE_SOURCE_ID, AutoFieldSubType, Hosting, @@ -159,15 +159,17 @@ export const FIELDS = { }, USER: { name: "User", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USER, - icon: TypeIconMap[FieldType.USER], + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, + icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][ + BBReferenceFieldSubType.USER + ], }, USERS: { - name: "Users", + name: "User List", type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - icon: TypeIconMap[FieldType.USERS], + subtype: BBReferenceFieldSubType.USER, + icon: TypeIconMap[FieldType.BB_REFERENCE][BBReferenceFieldSubType.USER], constraints: { type: "array", }, @@ -253,6 +255,7 @@ export const SchemaTypeOptions = [ { label: "Number", value: FieldType.NUMBER }, { label: "Boolean", value: FieldType.BOOLEAN }, { label: "Datetime", value: FieldType.DATETIME }, + { label: "JSON", value: FieldType.JSON }, ] export const SchemaTypeOptionsExpanded = SchemaTypeOptions.map(el => ({ diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js index 5efbb79611..af229ce7e4 100644 --- a/packages/builder/src/dataBinding.js +++ b/packages/builder/src/dataBinding.js @@ -29,6 +29,7 @@ import { JSONUtils, Constants } from "@budibase/frontend-core" import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json" import { environment, licensing } from "stores/portal" import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils" +import { FIELDS } from "constants/backend" const { ContextScopes } = Constants @@ -491,7 +492,7 @@ const generateComponentContextBindings = (asset, componentContext) => { icon: bindingCategory.icon, display: { name: `${fieldSchema.name || key}`, - type: fieldSchema.type, + type: fieldSchema.display?.type || fieldSchema.type, }, }) }) @@ -1019,15 +1020,23 @@ export const getSchemaForDatasource = (asset, datasource, options) => { // are objects let fixedSchema = {} Object.entries(schema || {}).forEach(([fieldName, fieldSchema]) => { + const field = Object.values(FIELDS).find( + field => + field.type === fieldSchema.type && + field.subtype === fieldSchema.subtype + ) + if (typeof fieldSchema === "string") { fixedSchema[fieldName] = { type: fieldSchema, name: fieldName, + display: { type: fieldSchema }, } } else { fixedSchema[fieldName] = { ...fieldSchema, name: fieldName, + display: { type: field?.name || fieldSchema.type }, } } }) @@ -1106,50 +1115,51 @@ export const getAllStateVariables = () => { getAllAssets().forEach(asset => { findAllMatchingComponents(asset.props, component => { const settings = componentStore.getComponentSettings(component._component) + const nestedTypes = [ + "buttonConfiguration", + "fieldConfiguration", + "stepConfiguration", + ] + // Extracts all event settings from a component instance. + // Recurses into nested types to find all event-like settings at any + // depth. const parseEventSettings = (settings, comp) => { + if (!settings?.length) { + return + } + + // Extract top level event settings settings .filter(setting => setting.type === "event") .forEach(setting => { eventSettings.push(comp[setting.key]) }) - } - const parseComponentSettings = (settings, component) => { - // Parse the nested button configurations + // Recurse into any nested instance types settings - .filter(setting => setting.type === "buttonConfiguration") + .filter(setting => nestedTypes.includes(setting.type)) .forEach(setting => { - const buttonConfig = component[setting.key] + const instances = comp[setting.key] + if (Array.isArray(instances) && instances.length) { + instances.forEach(instance => { + let type = instance?._component - if (Array.isArray(buttonConfig)) { - buttonConfig.forEach(button => { - const nestedSettings = componentStore.getComponentSettings( - button._component - ) - parseEventSettings(nestedSettings, button) + // Backwards compatibility for multi-step from blocks which + // didn't set a proper component type previously. + if (setting.type === "stepConfiguration" && !type) { + type = "@budibase/standard-components/multistepformblockstep" + } + + // Parsed nested component instances inside this setting + const nestedSettings = componentStore.getComponentSettings(type) + parseEventSettings(nestedSettings, instance) }) } }) - - parseEventSettings(settings, component) } - // Parse the base component settings - parseComponentSettings(settings, component) - - // Parse step configuration - const stepSetting = settings.find( - setting => setting.type === "stepConfiguration" - ) - const steps = stepSetting ? component[stepSetting.key] : [] - const stepDefinition = componentStore.getComponentSettings( - "@budibase/standard-components/multistepformblockstep" - ) - - steps?.forEach(step => { - parseComponentSettings(stepDefinition, step) - }) + parseEventSettings(settings, component) }) }) diff --git a/packages/builder/src/helpers/planTitle.js b/packages/builder/src/helpers/planTitle.js index 79f2bc2382..c08b8bf3fe 100644 --- a/packages/builder/src/helpers/planTitle.js +++ b/packages/builder/src/helpers/planTitle.js @@ -20,6 +20,9 @@ export function getFormattedPlanName(userPlanType) { case PlanType.ENTERPRISE: planName = "Enterprise" break + case PlanType.ENTERPRISE_BASIC_TRIAL: + planName = "Trial" + break default: planName = "Free" // Default to "Free" if the type is not explicitly handled } diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index fd6a97560d..60c45fd2e4 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -32,6 +32,7 @@ import { UserAvatars } from "@budibase/frontend-core" import { TOUR_KEYS } from "components/portal/onboarding/tours.js" import PreviewOverlay from "./_components/PreviewOverlay.svelte" + import EnterpriseBasicTrialModal from "components/portal/onboarding/EnterpriseBasicTrialModal.svelte" export let application @@ -192,6 +193,8 @@ + + diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 8508e943ff..72da3e9012 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -73,7 +73,10 @@ $context.device.width, $context.device.height ) - $: autoCloseSidePanel = !$builderStore.inBuilder && $sidePanelStore.open + $: autoCloseSidePanel = + !$builderStore.inBuilder && + $sidePanelStore.open && + !$sidePanelStore.ignoreClicksOutside $: screenId = $builderStore.inBuilder ? `${$builderStore.screen?._id}-screen` : "screen" @@ -191,6 +194,11 @@ } return url } + + const handleClickLink = () => { + mobileOpen = false + sidePanelStore.actions.close() + } @@ -281,7 +289,7 @@ url={navItem.url} subLinks={navItem.subLinks} internalLink={navItem.internalLink} - on:clickLink={() => (mobileOpen = false)} + on:clickLink={handleClickLink} leftNav={navigation === "Left"} {mobile} {navStateStore} @@ -316,10 +324,7 @@
diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte index 825b401bb8..bff5a78837 100644 --- a/packages/client/src/components/app/SidePanel.svelte +++ b/packages/client/src/components/app/SidePanel.svelte @@ -5,6 +5,9 @@ const { styleable, sidePanelStore, builderStore, dndIsDragging } = getContext("sdk") + export let onClose + export let ignoreClicksOutside + // Automatically show and hide the side panel when inside the builder. // For some unknown reason, svelte reactivity breaks if we reference the // reactive variable "open" inside the following expression, or if we define @@ -26,6 +29,10 @@ } } + // $: { + + // } + // Derive visibility $: open = $sidePanelStore.contentId === $component.id @@ -36,10 +43,17 @@ let renderKey = null $: { if (open) { + sidePanelStore.actions.setIgnoreClicksOutside(ignoreClicksOutside) renderKey = Math.random() } } + const handleSidePanelClose = async () => { + if (onClose) { + await onClose() + } + } + const showInSidePanel = (el, visible) => { const update = visible => { const target = document.getElementById("side-panel-container") @@ -51,6 +65,7 @@ } else { if (target.contains(node)) { target.removeChild(node) + handleSidePanelClose() } } } diff --git a/packages/client/src/components/app/blocks/FormBlockComponent.svelte b/packages/client/src/components/app/blocks/FormBlockComponent.svelte index 968ed36b8b..31610f79ac 100644 --- a/packages/client/src/components/app/blocks/FormBlockComponent.svelte +++ b/packages/client/src/components/app/blocks/FormBlockComponent.svelte @@ -21,6 +21,7 @@ [FieldType.JSON]: "jsonfield", [FieldType.BARCODEQR]: "codescanner", [FieldType.BB_REFERENCE]: "bbreferencefield", + [FieldType.BB_REFERENCE_SINGLE]: "bbreferencesinglefield", } const getFieldSchema = field => { diff --git a/packages/client/src/components/app/forms/BBReferenceField.svelte b/packages/client/src/components/app/forms/BBReferenceField.svelte index 5f00c503c2..c266268275 100644 --- a/packages/client/src/components/app/forms/BBReferenceField.svelte +++ b/packages/client/src/components/app/forms/BBReferenceField.svelte @@ -1,8 +1,10 @@ + + diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte index 8ab8e65a15..499f0443cb 100644 --- a/packages/client/src/components/app/forms/DateTimeField.svelte +++ b/packages/client/src/components/app/forms/DateTimeField.svelte @@ -49,7 +49,6 @@ readonly={fieldState.readonly} error={fieldState.error} id={fieldState.fieldId} - appendTo={document.getElementById("flatpickr-root")} {enableTime} {timeOnly} {time24hr} diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte index 1fbd0df522..a6d0564f7f 100644 --- a/packages/client/src/components/app/forms/RelationshipField.svelte +++ b/packages/client/src/components/app/forms/RelationshipField.svelte @@ -1,9 +1,9 @@ { const initialState = { contentId: null, + ignoreClicksOutside: true, } const store = writable(initialState) const derivedStore = derived(store, $store => { @@ -32,11 +33,18 @@ export const createSidePanelStore = () => { }, 50) } + const setIgnoreClicksOutside = bool => { + store.update(state => { + state.ignoreClicksOutside = bool + return state + }) + } return { subscribe: derivedStore.subscribe, actions: { open, close, + setIgnoreClicksOutside, }, } } diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index d883ee1b55..4de1012b01 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -240,6 +240,7 @@ const triggerAutomationHandler = async action => { const navigationHandler = action => { const { url, peek, externalNewTab } = action.parameters routeStore.actions.navigate(url, peek, externalNewTab) + closeSidePanelHandler() } const queryExecutionHandler = async action => { @@ -541,16 +542,22 @@ export const enrichButtonActions = (actions, context) => { // then execute the rest of the actions in the chain const result = await callback() if (result !== false) { - // Generate a new total context to pass into the next enrichment + // Generate a new total context for the next enrichment buttonContext.push(result) const newContext = { ...context, actions: buttonContext } - // Enrich and call the next button action if there is more than one action remaining + // Enrich and call the next button action if there is more + // than one action remaining const next = enrichButtonActions( actions.slice(i + 1), newContext ) - resolve(typeof next === "function" ? await next() : true) + if (typeof next === "function") { + // Pass the event context back into the new action chain + resolve(await next(eventContext)) + } else { + resolve(true) + } } else { resolve(false) } diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js index 7663ae09af..40546b6f66 100644 --- a/packages/frontend-core/src/api/backups.js +++ b/packages/frontend-core/src/api/backups.js @@ -1,7 +1,4 @@ export const buildBackupsEndpoints = API => ({ - /** - * Gets a list of users in the current tenant. - */ searchBackups: async ({ appId, trigger, type, page, startDate, endDate }) => { const opts = {} if (page) { diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte index 074c2dbd9b..fb7aa98405 100644 --- a/packages/frontend-core/src/components/FilterBuilder.svelte +++ b/packages/frontend-core/src/components/FilterBuilder.svelte @@ -124,6 +124,8 @@ const fieldSchema = schemaFields.find(x => x.name === filter.field) filter.type = fieldSchema?.type filter.subtype = fieldSchema?.subtype + filter.formulaType = fieldSchema?.formulaType + filter.constraints = fieldSchema?.constraints // Update external type based on field filter.externalType = getSchema(filter)?.externalType @@ -280,7 +282,7 @@ timeOnly={getSchema(filter)?.timeOnly} bind:value={filter.value} /> - {:else if filter.type === FieldType.BB_REFERENCE} + {:else if [FieldType.BB_REFERENCE, FieldType.BB_REFERENCE_SINGLE].includes(filter.type)} {:else} @@ -324,8 +327,6 @@ diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte index 48b1279346..5d98ba903b 100644 --- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte @@ -1,25 +1,36 @@ + + diff --git a/packages/frontend-core/src/components/grid/cells/DateCell.svelte b/packages/frontend-core/src/components/grid/cells/DateCell.svelte index 53b159ee30..3c86fe3605 100644 --- a/packages/frontend-core/src/components/grid/cells/DateCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DateCell.svelte @@ -1,7 +1,8 @@ -
+ + +
- {#if value} - {displayValue} - {/if} + {displayValue}
{#if editable} {/if}
-{#if editable} -
- onChange(e.detail)} - appendTo={document.documentElement} - enableTime={!dateOnly} - {timeOnly} - time24hr - ignoreTimezones={schema.ignoreTimezones} - bind:flatpickr - on:open={() => (isOpen = true)} - on:close={() => (isOpen = false)} +{#if isOpen} + + (value = e.detail)} + {enableTime} + {timeOnly} + {ignoreTimezones} /> -
+ {/if} diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index 74d98ec130..32a9dea83b 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -43,6 +43,9 @@ on:mouseup on:click on:contextmenu + on:touchstart + on:touchend + on:touchcancel {style} > {#if error} diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index 657f618759..bb38c5094f 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -1,30 +1,22 @@ @@ -258,6 +258,9 @@
- - {#if editIsOpen} -
{ - editIsOpen = false - }} - class="content" - > - -
- {:else} - - - Edit column - - - Duplicate column - - - Use as display column - - - Sort {sortingLabels.ascending} - - - Sort {sortingLabels.descending} - - - Move left - - - Move right - - - Hide column - - {#if $config.canEditColumns && column.schema.type === "link" && column.schema.tableId === TableNames.USERS} - - Migrate to user column +{#if open} + + {#if editIsOpen} +
+ +
+ {:else} + + + Edit column - {/if} - - {/if} - + + Duplicate column + + + Use as display column + + + Sort {sortingLabels.ascending} + + + Sort {sortingLabels.descending} + + + Move left + + + Move right + + + Hide column + + {#if $config.canEditColumns && column.schema.type === "link" && column.schema.tableId === TableNames.USERS} + + Migrate to user column + + {/if} + + {/if} + +{/if} diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte index bf1fe92ef0..f5a8351604 100644 --- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte @@ -1,10 +1,11 @@ + + +
dispatch("close")} + on:wheel={e => e.stopPropagation()} + > + +
+ + + diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte index ed09301bb9..78cb186f29 100644 --- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte +++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte @@ -2,6 +2,7 @@ import { getContext, onMount } from "svelte" import { debounce } from "../../../utils/utils" import { NewRowID } from "../lib/constants" + import { getCellID, parseCellID } from "../lib/utils" const { rows, @@ -20,6 +21,7 @@ const ignoredOriginSelectors = [ ".spectrum-Modal", + ".date-time-popover", "#builder-side-panel-container", "[data-grid-ignore]", ] @@ -153,7 +155,7 @@ if (!firstColumn) { return } - focusedCellId.set(`${firstRow._id}-${firstColumn.name}`) + focusedCellId.set(getCellID(firstRow._id, firstColumn.name)) } // Changes the focused cell by moving it left or right to a different column @@ -162,8 +164,7 @@ return } const cols = $visibleColumns - const split = $focusedCellId.split("-") - const columnName = split[1] + const { id, field: columnName } = parseCellID($focusedCellId) let newColumnName if (columnName === $stickyColumn?.name) { const index = delta - 1 @@ -177,7 +178,7 @@ } } if (newColumnName) { - $focusedCellId = `${split[0]}-${newColumnName}` + $focusedCellId = getCellID(id, newColumnName) } } @@ -188,8 +189,8 @@ } const newRow = $rows[$focusedRow.__idx + delta] if (newRow) { - const split = $focusedCellId.split("-") - $focusedCellId = `${newRow._id}-${split[1]}` + const { field } = parseCellID($focusedCellId) + $focusedCellId = getCellID(newRow._id, field) } } diff --git a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte index 55308d4c6e..4a413d7dde 100644 --- a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte @@ -1,7 +1,9 @@ +
+ {#if $menu.visible} -
menu.actions.close()}> - - - Copy - - - Paste - - dispatch("edit-row", $focusedRow)} - on:click={menu.actions.close} - > - Edit row in modal - - copyToClipboard($focusedRow?._id)} - on:click={menu.actions.close} - > - Copy row _id - - copyToClipboard($focusedRow?._rev)} - on:click={menu.actions.close} - > - Copy row _rev - - - Duplicate row - - - Delete row - - -
+ {#key style} + + + + Copy + + + Paste + + dispatch("edit-row", $focusedRow)} + on:click={menu.actions.close} + > + Edit row in modal + + copyToClipboard($focusedRow?._id)} + on:click={menu.actions.close} + > + Copy row _id + + copyToClipboard($focusedRow?._rev)} + on:click={menu.actions.close} + > + Copy row _rev + + + Duplicate row + + + Delete row + + + + {/key} {/if} diff --git a/packages/frontend-core/src/components/grid/overlays/PopoverOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/PopoverOverlay.svelte new file mode 100644 index 0000000000..a03ba6d927 --- /dev/null +++ b/packages/frontend-core/src/components/grid/overlays/PopoverOverlay.svelte @@ -0,0 +1,9 @@ +
+ + diff --git a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte index 1140962583..e564108430 100644 --- a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte @@ -21,6 +21,7 @@ class="resize-slider" class:visible={activeColumn === $stickyColumn.name} on:mousedown={e => resize.actions.startResizing($stickyColumn, e)} + on:touchstart={e => resize.actions.startResizing($stickyColumn, e)} on:dblclick={() => resize.actions.resetSize($stickyColumn)} style="left:{GutterWidth + $stickyColumn.width}px;" > @@ -32,6 +33,7 @@ class="resize-slider" class:visible={activeColumn === column.name} on:mousedown={e => resize.actions.startResizing(column, e)} + on:touchstart={e => resize.actions.startResizing(column, e)} on:dblclick={() => resize.actions.resetSize(column)} style={getStyle(column, offset, $scrollLeft)} > diff --git a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte index 43a64f3fbd..71d04ecbda 100644 --- a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte @@ -2,6 +2,7 @@ import { getContext } from "svelte" import { domDebounce } from "../../../utils/utils" import { DefaultRowHeight, ScrollBarSize } from "../lib/constants" + import { parseEventLocation } from "../lib/utils" const { scroll, @@ -17,6 +18,7 @@ height, isDragging, menu, + focusedCellAPI, } = getContext("grid") // State for dragging bars @@ -47,33 +49,27 @@ $: barLeft = ScrollBarSize + availWidth * ($scrollLeft / $maxScrollLeft) // Helper to close the context menu if it's open - const closeMenu = () => { + const closePopovers = () => { if ($menu.visible) { menu.actions.close() } - } - - const getLocation = e => { - return { - y: e.touches?.[0]?.clientY ?? e.clientY, - x: e.touches?.[0]?.clientX ?? e.clientX, - } + $focusedCellAPI?.blur() } // V scrollbar drag handlers const startVDragging = e => { e.preventDefault() - initialMouse = getLocation(e).y + initialMouse = parseEventLocation(e).y initialScroll = $scrollTop document.addEventListener("mousemove", moveVDragging) document.addEventListener("touchmove", moveVDragging) document.addEventListener("mouseup", stopVDragging) document.addEventListener("touchend", stopVDragging) isDraggingV = true - closeMenu() + closePopovers() } const moveVDragging = domDebounce(e => { - const delta = getLocation(e).y - initialMouse + const delta = parseEventLocation(e).y - initialMouse const weight = delta / availHeight const newScrollTop = initialScroll + weight * $maxScrollTop scroll.update(state => ({ @@ -92,17 +88,17 @@ // H scrollbar drag handlers const startHDragging = e => { e.preventDefault() - initialMouse = getLocation(e).x + initialMouse = parseEventLocation(e).x initialScroll = $scrollLeft document.addEventListener("mousemove", moveHDragging) document.addEventListener("touchmove", moveHDragging) document.addEventListener("mouseup", stopHDragging) document.addEventListener("touchend", stopHDragging) isDraggingH = true - closeMenu() + closePopovers() } const moveHDragging = domDebounce(e => { - const delta = getLocation(e).x - initialMouse + const delta = parseEventLocation(e).x - initialMouse const weight = delta / availWidth const newScrollLeft = initialScroll + weight * $maxScrollLeft scroll.update(state => ({ diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js index 31638e7c79..8ceaae105f 100644 --- a/packages/frontend-core/src/components/grid/stores/columns.js +++ b/packages/frontend-core/src/components/grid/stores/columns.js @@ -48,22 +48,28 @@ export const createStores = () => { export const deriveStores = context => { const { columns, stickyColumn } = context - // Derive if we have any normal columns - const hasNonAutoColumn = derived( + // Quick access to all columns + const allColumns = derived( [columns, stickyColumn], ([$columns, $stickyColumn]) => { let allCols = $columns || [] if ($stickyColumn) { allCols = [...allCols, $stickyColumn] } - const normalCols = allCols.filter(column => { - return !column.schema?.autocolumn - }) - return normalCols.length > 0 + return allCols } ) + // Derive if we have any normal columns + const hasNonAutoColumn = derived(allColumns, $allColumns => { + const normalCols = $allColumns.filter(column => { + return !column.schema?.autocolumn + }) + return normalCols.length > 0 + }) + return { + allColumns, hasNonAutoColumn, } } @@ -142,24 +148,26 @@ export const createActions = context => { } export const initialise = context => { - const { definition, columns, stickyColumn, enrichedSchema } = context + const { + definition, + columns, + stickyColumn, + allColumns, + enrichedSchema, + compact, + } = context // Merge new schema fields with existing schema in order to preserve widths - enrichedSchema.subscribe($enrichedSchema => { + const processColumns = $enrichedSchema => { if (!$enrichedSchema) { columns.set([]) stickyColumn.set(null) return } const $definition = get(definition) - const $columns = get(columns) + const $allColumns = get(allColumns) const $stickyColumn = get(stickyColumn) - - // Generate array of all columns to easily find pre-existing columns - let allColumns = $columns || [] - if ($stickyColumn) { - allColumns.push($stickyColumn) - } + const $compact = get(compact) // Find primary display let primaryDisplay @@ -171,7 +179,7 @@ export const initialise = context => { // Get field list let fields = [] Object.keys($enrichedSchema).forEach(field => { - if (field !== primaryDisplay) { + if ($compact || field !== primaryDisplay) { fields.push(field) } }) @@ -181,7 +189,7 @@ export const initialise = context => { fields .map(field => { const fieldSchema = $enrichedSchema[field] - const oldColumn = allColumns?.find(x => x.name === field) + const oldColumn = $allColumns?.find(x => x.name === field) return { name: field, label: fieldSchema.displayName || field, @@ -189,9 +197,18 @@ export const initialise = context => { width: fieldSchema.width || oldColumn?.width || DefaultColumnWidth, visible: fieldSchema.visible ?? true, order: fieldSchema.order ?? oldColumn?.order, + primaryDisplay: field === primaryDisplay, } }) .sort((a, b) => { + // If we don't have a pinned column then primary display will be in + // the normal columns list, and should be first + if (a.name === primaryDisplay) { + return -1 + } else if (b.name === primaryDisplay) { + return 1 + } + // Sort by order first const orderA = a.order const orderB = b.order @@ -214,12 +231,12 @@ export const initialise = context => { ) // Update sticky column - if (!primaryDisplay) { + if ($compact || !primaryDisplay) { stickyColumn.set(null) return } const stickySchema = $enrichedSchema[primaryDisplay] - const oldStickyColumn = allColumns?.find(x => x.name === primaryDisplay) + const oldStickyColumn = $allColumns?.find(x => x.name === primaryDisplay) stickyColumn.set({ name: primaryDisplay, label: stickySchema.displayName || primaryDisplay, @@ -228,6 +245,13 @@ export const initialise = context => { visible: true, order: 0, left: GutterWidth, + primaryDisplay: true, }) - }) + } + + // Process columns when schema changes + enrichedSchema.subscribe(processColumns) + + // Process columns when compact flag changes + compact.subscribe(() => processColumns(get(enrichedSchema))) } diff --git a/packages/frontend-core/src/components/grid/stores/datasource.js b/packages/frontend-core/src/components/grid/stores/datasource.js index 7b95fe7430..6c309380e6 100644 --- a/packages/frontend-core/src/components/grid/stores/datasource.js +++ b/packages/frontend-core/src/components/grid/stores/datasource.js @@ -75,14 +75,18 @@ export const deriveStores = context => { } ) - const isDatasourcePlus = derived(datasource, $datasource => { - return ["table", "viewV2"].includes($datasource?.type) + const hasBudibaseIdentifiers = derived(datasource, $datasource => { + let type = $datasource?.type + if (type === "provider") { + type = $datasource.value?.datasource?.type + } + return ["table", "viewV2", "link"].includes(type) }) return { schema, enrichedSchema, - isDatasourcePlus, + hasBudibaseIdentifiers, } } diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.js index 2d11b65bd4..d7f0e21b84 100644 --- a/packages/frontend-core/src/components/grid/stores/menu.js +++ b/packages/frontend-core/src/components/grid/stores/menu.js @@ -13,13 +13,14 @@ export const createStores = () => { } export const createActions = context => { - const { menu, focusedCellId, rand } = context + const { menu, focusedCellId, gridID } = context const open = (cellId, e) => { e.preventDefault() + e.stopPropagation() // Get DOM node for grid data wrapper to compute relative position to - const gridNode = document.getElementById(`grid-${rand}`) + const gridNode = document.getElementById(gridID) const dataNode = gridNode?.getElementsByClassName("grid-data-outer")?.[0] if (!dataNode) { return diff --git a/packages/frontend-core/src/components/grid/stores/reorder.js b/packages/frontend-core/src/components/grid/stores/reorder.js index f820593174..b3abbbabf3 100644 --- a/packages/frontend-core/src/components/grid/stores/reorder.js +++ b/packages/frontend-core/src/components/grid/stores/reorder.js @@ -1,4 +1,5 @@ import { get, writable, derived } from "svelte/store" +import { parseEventLocation } from "../lib/utils" const reorderInitialState = { sourceColumn: null, @@ -31,8 +32,8 @@ export const createActions = context => { scroll, bounds, stickyColumn, - ui, maxScrollLeft, + width, } = context let autoScrollInterval @@ -43,7 +44,6 @@ export const createActions = context => { const $visibleColumns = get(visibleColumns) const $bounds = get(bounds) const $stickyColumn = get(stickyColumn) - ui.actions.blur() // Generate new breakpoints for the current columns let breakpoints = $visibleColumns.map(col => ({ @@ -55,6 +55,11 @@ export const createActions = context => { x: 0, column: $stickyColumn.name, }) + } else if (!$visibleColumns[0].primaryDisplay) { + breakpoints.unshift({ + x: 0, + column: null, + }) } // Update state @@ -69,6 +74,9 @@ export const createActions = context => { // Add listeners to handle mouse movement document.addEventListener("mousemove", onReorderMouseMove) document.addEventListener("mouseup", stopReordering) + document.addEventListener("touchmove", onReorderMouseMove) + document.addEventListener("touchend", stopReordering) + document.addEventListener("touchcancel", stopReordering) // Trigger a move event immediately so ensure a candidate column is chosen onReorderMouseMove(e) @@ -77,7 +85,7 @@ export const createActions = context => { // Callback when moving the mouse when reordering columns const onReorderMouseMove = e => { // Immediately handle the current position - const x = e.clientX + const { x } = parseEventLocation(e) reorder.update(state => ({ ...state, latestX: x, @@ -86,8 +94,8 @@ export const createActions = context => { // Check if we need to start auto-scrolling const $reorder = get(reorder) - const proximityCutoff = 140 - const speedFactor = 8 + const proximityCutoff = Math.min(140, get(width) / 6) + const speedFactor = 16 const rightProximity = Math.max(0, $reorder.gridLeft + $reorder.width - x) const leftProximity = Math.max(0, x - $reorder.gridLeft) if (rightProximity < proximityCutoff) { @@ -158,19 +166,22 @@ export const createActions = context => { // Ensure auto-scrolling is stopped stopAutoScroll() - // Swap position of columns - let { sourceColumn, targetColumn } = get(reorder) - moveColumn(sourceColumn, targetColumn) - - // Reset state - reorder.set(reorderInitialState) - // Remove event handlers document.removeEventListener("mousemove", onReorderMouseMove) document.removeEventListener("mouseup", stopReordering) + document.removeEventListener("touchmove", onReorderMouseMove) + document.removeEventListener("touchend", stopReordering) + document.removeEventListener("touchcancel", stopReordering) - // Save column changes - await columns.actions.saveChanges() + // Ensure there's actually a change + let { sourceColumn, targetColumn } = get(reorder) + if (sourceColumn !== targetColumn) { + moveColumn(sourceColumn, targetColumn) + await columns.actions.saveChanges() + } + + // Reset state + reorder.set(reorderInitialState) } // Moves a column after another columns. @@ -185,8 +196,7 @@ export const createActions = context => { if (--targetIdx < sourceIdx) { targetIdx++ } - state.splice(targetIdx, 0, removed[0]) - return state.slice() + return state.toSpliced(targetIdx, 0, removed[0]) }) } diff --git a/packages/frontend-core/src/components/grid/stores/resize.js b/packages/frontend-core/src/components/grid/stores/resize.js index 2dc9e0784c..157465e838 100644 --- a/packages/frontend-core/src/components/grid/stores/resize.js +++ b/packages/frontend-core/src/components/grid/stores/resize.js @@ -1,5 +1,6 @@ import { writable, get, derived } from "svelte/store" import { MinColumnWidth, DefaultColumnWidth } from "../lib/constants" +import { parseEventLocation } from "../lib/utils" const initialState = { initialMouseX: null, @@ -24,8 +25,11 @@ export const createActions = context => { // Starts resizing a certain column const startResizing = (column, e) => { + const { x } = parseEventLocation(e) + // Prevent propagation to stop reordering triggering e.stopPropagation() + e.preventDefault() ui.actions.blur() // Find and cache index @@ -39,7 +43,7 @@ export const createActions = context => { width: column.width, left: column.left, initialWidth: column.width, - initialMouseX: e.clientX, + initialMouseX: x, column: column.name, columnIdx, }) @@ -47,12 +51,16 @@ export const createActions = context => { // Add mouse event listeners to handle resizing document.addEventListener("mousemove", onResizeMouseMove) document.addEventListener("mouseup", stopResizing) + document.addEventListener("touchmove", onResizeMouseMove) + document.addEventListener("touchend", stopResizing) + document.addEventListener("touchcancel", stopResizing) } // Handler for moving the mouse to resize columns const onResizeMouseMove = e => { const { initialMouseX, initialWidth, width, columnIdx } = get(resize) - const dx = e.clientX - initialMouseX + const { x } = parseEventLocation(e) + const dx = x - initialMouseX const newWidth = Math.round(Math.max(MinColumnWidth, initialWidth + dx)) // Ignore small changes @@ -87,6 +95,9 @@ export const createActions = context => { resize.set(initialState) document.removeEventListener("mousemove", onResizeMouseMove) document.removeEventListener("mouseup", stopResizing) + document.removeEventListener("touchmove", onResizeMouseMove) + document.removeEventListener("touchend", stopResizing) + document.removeEventListener("touchcancel", stopResizing) // Persist width if it changed if ($resize.width !== $resize.initialWidth) { diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js index 5dc9413ccd..c73dae8991 100644 --- a/packages/frontend-core/src/components/grid/stores/rows.js +++ b/packages/frontend-core/src/components/grid/stores/rows.js @@ -1,6 +1,7 @@ import { writable, derived, get } from "svelte/store" import { fetchData } from "../../../fetch" import { NewRowID, RowPageSize } from "../lib/constants" +import { getCellID, parseCellID } from "../lib/utils" import { tick } from "svelte" import { Helpers } from "@budibase/bbui" @@ -83,7 +84,7 @@ export const createActions = context => { error, notifications, fetch, - isDatasourcePlus, + hasBudibaseIdentifiers, refreshing, } = context const instanceLoaded = writable(false) @@ -196,6 +197,27 @@ export const createActions = context => { // Handles validation errors from the rows API and updates local validation // state, storing error messages against relevant cells const handleValidationError = (rowId, error) => { + let errorString + if (typeof error === "string") { + errorString = error + } else if (typeof error?.message === "string") { + errorString = error.message + } + + // If the server doesn't reply with a valid error, assume that the source + // of the error is the focused cell's column + if (!error?.json?.validationErrors && errorString) { + const { field: focusedColumn } = parseCellID(get(focusedCellId)) + if (focusedColumn) { + error = { + json: { + validationErrors: { + [focusedColumn]: error.message, + }, + }, + } + } + } if (error?.json?.validationErrors) { // Normal validation errors const keys = Object.keys(error.json.validationErrors) @@ -214,11 +236,19 @@ export const createActions = context => { // Process errors for columns that we have for (let column of erroredColumns) { + // Ensure we have a valid error to display + let err = error.json.validationErrors[column] + if (Array.isArray(err)) { + err = err[0] + } + if (typeof err !== "string" || !err.length) { + error = "Something went wrong" + } + // Set error against the cell validation.actions.setError( - `${rowId}-${column}`, - `${column} ${error.json.validationErrors[column]}` + getCellID(rowId, column), + Helpers.capitalise(err) ) - // Ensure the column is visible const index = $columns.findIndex(x => x.name === column) if (index !== -1 && !$columns[index].visible) { @@ -236,10 +266,10 @@ export const createActions = context => { // Focus the first cell with an error if (erroredColumns.length) { - focusedCellId.set(`${rowId}-${erroredColumns[0]}`) + focusedCellId.set(getCellID(rowId, erroredColumns[0])) } } else { - get(notifications).error(error?.message || "An unknown error occurred") + get(notifications).error(errorString || "An unknown error occurred") } } @@ -436,14 +466,14 @@ export const createActions = context => { } let rowsToAppend = [] let newRow - const $isDatasourcePlus = get(isDatasourcePlus) + const $hasBudibaseIdentifiers = get(hasBudibaseIdentifiers) for (let i = 0; i < newRows.length; i++) { newRow = newRows[i] // Ensure we have a unique _id. // This means generating one for non DS+, overwriting any that may already // exist as we cannot allow duplicates. - if (!$isDatasourcePlus) { + if (!$hasBudibaseIdentifiers) { newRow._id = Helpers.uuid() } @@ -488,7 +518,7 @@ export const createActions = context => { const cleanRow = row => { let clone = { ...row } delete clone.__idx - if (!get(isDatasourcePlus)) { + if (!get(hasBudibaseIdentifiers)) { delete clone._id } return clone @@ -523,6 +553,7 @@ export const initialise = context => { previousFocusedCellId, rows, validation, + focusedCellId, } = context // Wipe the row change cache when changing row @@ -537,12 +568,23 @@ export const initialise = context => { // Ensure any unsaved changes are saved when changing cell previousFocusedCellId.subscribe(async id => { - const rowId = id?.split("-")[0] - const hasErrors = validation.actions.rowHasErrors(rowId) - const hasChanges = Object.keys(get(rowChangeCache)[rowId] || {}).length > 0 - const isSavingChanges = get(inProgressChanges)[rowId] - if (rowId && !hasErrors && hasChanges && !isSavingChanges) { - await rows.actions.applyRowChanges(rowId) + if (!id) { + return + } + // Stop if we changed row + const split = parseCellID(id) + const oldRowId = split.id + const oldColumn = split.field + const { id: newRowId } = parseCellID(get(focusedCellId)) + if (oldRowId !== newRowId) { + return + } + // Otherwise we just changed cell in the same row + const hasChanges = oldColumn in (get(rowChangeCache)[oldRowId] || {}) + const hasErrors = validation.actions.rowHasErrors(oldRowId) + const isSavingChanges = get(inProgressChanges)[oldRowId] + if (oldRowId && !hasErrors && hasChanges && !isSavingChanges) { + await rows.actions.applyRowChanges(oldRowId) } }) } diff --git a/packages/frontend-core/src/components/grid/stores/scroll.js b/packages/frontend-core/src/components/grid/stores/scroll.js index 88a676f078..b071c1fc38 100644 --- a/packages/frontend-core/src/components/grid/stores/scroll.js +++ b/packages/frontend-core/src/components/grid/stores/scroll.js @@ -1,6 +1,7 @@ import { writable, derived, get } from "svelte/store" import { tick } from "svelte" import { Padding, GutterWidth, FocusedCellMinOffset } from "../lib/constants" +import { parseCellID } from "../lib/utils" export const createStores = () => { const scroll = writable({ @@ -176,7 +177,7 @@ export const initialise = context => { // Ensure horizontal position is viewable // Check horizontal position of columns next const $visibleColumns = get(visibleColumns) - const columnName = $focusedCellId?.split("-")[1] + const { field: columnName } = parseCellID($focusedCellId) const column = $visibleColumns.find(col => col.name === columnName) if (!column) { return diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js index da0558bb5b..8bc295cb74 100644 --- a/packages/frontend-core/src/components/grid/stores/ui.js +++ b/packages/frontend-core/src/components/grid/stores/ui.js @@ -7,6 +7,7 @@ import { MediumRowHeight, NewRowID, } from "../lib/constants" +import { parseCellID } from "../lib/utils" export const createStores = context => { const { props } = context @@ -25,7 +26,7 @@ export const createStores = context => { const focusedRowId = derived( focusedCellId, $focusedCellId => { - return $focusedCellId?.split("-")[0] + return parseCellID($focusedCellId)?.id }, null ) @@ -72,7 +73,7 @@ export const deriveStores = context => { const focusedRow = derived( [focusedCellId, rowLookupMap, rows], ([$focusedCellId, $rowLookupMap, $rows]) => { - const rowId = $focusedCellId?.split("-")[0] + const rowId = parseCellID($focusedCellId)?.id // Edge case for new rows if (rowId === NewRowID) { @@ -98,7 +99,7 @@ export const deriveStores = context => { // Derive whether we should use the compact UI, depending on width const compact = derived([stickyColumn, width], ([$stickyColumn, $width]) => { - return ($stickyColumn?.width || 0) + $width + GutterWidth < 1100 + return ($stickyColumn?.width || 0) + $width + GutterWidth < 800 }) return { @@ -152,7 +153,7 @@ export const initialise = context => { const hasRow = rows.actions.hasRow // Check selected cell - const selectedRowId = $focusedCellId?.split("-")[0] + const selectedRowId = parseCellID($focusedCellId)?.id if (selectedRowId && !hasRow(selectedRowId)) { focusedCellId.set(null) } diff --git a/packages/frontend-core/src/components/grid/stores/validation.js b/packages/frontend-core/src/components/grid/stores/validation.js index 70db076593..34efde9180 100644 --- a/packages/frontend-core/src/components/grid/stores/validation.js +++ b/packages/frontend-core/src/components/grid/stores/validation.js @@ -1,4 +1,5 @@ import { writable, get, derived } from "svelte/store" +import { getCellID, parseCellID } from "../lib/utils" // Normally we would break out actions into the explicit "createActions" // function, but for validation all these actions are pure so can go into @@ -12,7 +13,7 @@ export const createStores = () => { Object.entries($validation).forEach(([key, error]) => { // Extract row ID from all errored cell IDs if (error) { - map[key.split("-")[0]] = true + map[parseCellID(key).id] = true } }) return map @@ -53,10 +54,10 @@ export const initialise = context => { const $stickyColumn = get(stickyColumn) validation.update(state => { $columns.forEach(column => { - state[`${id}-${column.name}`] = null + state[getCellID(id, column.name)] = null }) if ($stickyColumn) { - state[`${id}-${$stickyColumn.name}`] = null + state[getCellID(id, stickyColumn.name)] = null } return state }) diff --git a/packages/frontend-core/src/components/grid/stores/viewport.js b/packages/frontend-core/src/components/grid/stores/viewport.js index 8df8acd0f4..96a5a954ee 100644 --- a/packages/frontend-core/src/components/grid/stores/viewport.js +++ b/packages/frontend-core/src/components/grid/stores/viewport.js @@ -1,7 +1,6 @@ import { derived } from "svelte/store" import { - MaxCellRenderHeight, - MaxCellRenderWidthOverflow, + MaxCellRenderOverflow, MinColumnWidth, ScrollBarSize, } from "../lib/constants" @@ -95,11 +94,11 @@ export const deriveStores = context => { // Compute the last row index with space to render popovers below it const minBottom = - $height - ScrollBarSize * 3 - MaxCellRenderHeight + offset + $height - ScrollBarSize * 3 - MaxCellRenderOverflow + offset const lastIdx = Math.floor(minBottom / $rowHeight) // Compute the first row index with space to render popovers above it - const minTop = MaxCellRenderHeight + offset + const minTop = MaxCellRenderOverflow + offset const firstIdx = Math.ceil(minTop / $rowHeight) // Use the greater of the two indices so that we prefer content below, @@ -117,7 +116,7 @@ export const deriveStores = context => { let inversionIdx = $visibleColumns.length for (let i = $visibleColumns.length - 1; i >= 0; i--, inversionIdx--) { const rightEdge = $visibleColumns[i].left + $visibleColumns[i].width - if (rightEdge + MaxCellRenderWidthOverflow <= cutoff) { + if (rightEdge + MaxCellRenderOverflow <= cutoff) { break } } diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 95228c3bdc..bd05fafd33 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -4,7 +4,7 @@ export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/shared-core" export { Feature as Features } from "@budibase/types" import { BpmCorrelationKey } from "@budibase/shared-core" -import { FieldType, FieldTypeSubtypes } from "@budibase/types" +import { FieldType, BBReferenceFieldSubType } from "@budibase/types" // Cookie names export const Cookies = { @@ -57,6 +57,7 @@ export const PlanType = { PRO: "pro", BUSINESS: "business", ENTERPRISE: "enterprise", + ENTERPRISE_BASIC_TRIAL: "enterprise_basic_trial", } /** @@ -124,17 +125,18 @@ export const TypeIconMap = { [FieldType.ARRAY]: "Duplicate", [FieldType.NUMBER]: "123", [FieldType.BOOLEAN]: "Boolean", - [FieldType.ATTACHMENTS]: "Attach", - [FieldType.ATTACHMENT_SINGLE]: "Attach", + [FieldType.ATTACHMENTS]: "DocumentFragmentGroup", + [FieldType.ATTACHMENT_SINGLE]: "DocumentFragment", [FieldType.LINK]: "DataCorrelated", [FieldType.FORMULA]: "Calculator", [FieldType.JSON]: "Brackets", [FieldType.BIGINT]: "TagBold", [FieldType.AUTO]: "MagicWand", - [FieldType.USER]: "User", - [FieldType.USERS]: "UserGroup", [FieldType.BB_REFERENCE]: { - [FieldTypeSubtypes.BB_REFERENCE.USER]: "User", - [FieldTypeSubtypes.BB_REFERENCE.USERS]: "UserGroup", + [BBReferenceFieldSubType.USER]: "UserGroup", + [BBReferenceFieldSubType.USERS]: "UserGroup", + }, + [FieldType.BB_REFERENCE_SINGLE]: { + [BBReferenceFieldSubType.USER]: "User", }, } diff --git a/packages/frontend-core/src/utils/rows.js b/packages/frontend-core/src/utils/rows.js index ea43d63734..50f676983d 100644 --- a/packages/frontend-core/src/utils/rows.js +++ b/packages/frontend-core/src/utils/rows.js @@ -8,6 +8,10 @@ const isBetterSample = (newValue, oldValue) => { return true } + if (oldValue != null && newValue == null) { + return false + } + // Don't change type const oldType = typeof oldValue const newType = typeof newValue diff --git a/packages/pro b/packages/pro index dff7b5a9dd..ff397e5454 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit dff7b5a9dd1fd770f8a48fb8e6df1740be605f18 +Subproject commit ff397e5454ad3361b25efdf14746c36dcbd3f409 diff --git a/packages/server/package.json b/packages/server/package.json index b2ac4e7d43..5e25fd3fc5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -98,7 +98,7 @@ "memorystream": "0.3.1", "mongodb": "^6.3.0", "mssql": "10.0.1", - "mysql2": "3.5.2", + "mysql2": "3.9.7", "node-fetch": "2.6.7", "object-sizeof": "2.6.1", "open": "8.4.0", diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 6acdfcd465..e73058239b 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -52,6 +52,8 @@ import { FetchAppPackageResponse, DuplicateAppRequest, DuplicateAppResponse, + UpdateAppRequest, + UpdateAppResponse, } from "@budibase/types" import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts" import sdk from "../../sdk" @@ -450,7 +452,7 @@ export async function create(ctx: UserCtx) { // 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: UserCtx<{ name?: string; url?: string }, App> + ctx: UserCtx ) { const apps = (await dbCore.getAllApps({ dev: true })) as App[] // validation diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index c3d1f2cb47..8bc73e599a 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -2,7 +2,7 @@ import stream from "stream" import archiver from "archiver" import { quotas } from "@budibase/pro" -import { objectStore } from "@budibase/backend-core" +import { objectStore, context } from "@budibase/backend-core" import * as internal from "./internal" import * as external from "./external" import { isExternalTableID } from "../../../integrations/utils" @@ -198,8 +198,18 @@ export async function destroy(ctx: UserCtx) { export async function search(ctx: Ctx) { const tableId = utils.getTableId(ctx) + await context.ensureSnippetContext(true) + + const enrichedQuery = await utils.enrichSearchContext( + { ...ctx.request.body.query }, + { + user: sdk.users.getUserContextBindings(ctx.user), + } + ) + const searchParams: RowSearchParams = { ...ctx.request.body, + query: enrichedQuery, tableId, } diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts index a75a6cd2cc..a6a02952d3 100644 --- a/packages/server/src/api/controllers/row/staticFormula.ts +++ b/packages/server/src/api/controllers/row/staticFormula.ts @@ -1,20 +1,11 @@ import { getRowParams } from "../../../db/utils" import { outputProcessing, - processAutoColumn, processFormulas, } from "../../../utilities/rowProcessor" -import { context, locks } from "@budibase/backend-core" -import { - Table, - Row, - LockType, - LockName, - FormulaType, - FieldType, -} from "@budibase/types" +import { context } from "@budibase/backend-core" +import { Table, Row, FormulaType, FieldType } from "@budibase/types" import * as linkRows from "../../../db/linkedRows" -import sdk from "../../../sdk" import isEqual from "lodash/isEqual" import { cloneDeep } from "lodash/fp" @@ -151,30 +142,7 @@ export async function finaliseRow( // if another row has been written since processing this will // handle the auto ID clash if (oldTable && !isEqual(oldTable, table)) { - try { - await db.put(table) - } catch (err: any) { - if (err.status === 409) { - // Some conflicts with the autocolumns occurred, we need to refetch the table and recalculate - await locks.doWithLock( - { - type: LockType.AUTO_EXTEND, - name: LockName.PROCESS_AUTO_COLUMNS, - resource: table._id, - }, - async () => { - const latestTable = await sdk.tables.getTable(table._id!) - let response = processAutoColumn(null, latestTable, row, { - reprocessing: true, - }) - await db.put(response.table) - row = response.row - } - ) - } else { - throw err - } - } + await db.put(table) } const response = await db.put(row) // for response, calculate the formulas for the enriched row diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts index 6255e13c1c..afb98d0255 100644 --- a/packages/server/src/api/controllers/row/utils/basic.ts +++ b/packages/server/src/api/controllers/row/utils/basic.ts @@ -1,5 +1,6 @@ // need to handle table name + field or just field, depending on if relationships used import { FieldType, Row, Table } from "@budibase/types" +import { helpers } from "@budibase/shared-core" import { generateRowIdField } from "../../../../integrations/utils" import { CONSTANT_INTERNAL_ROW_COLS } from "../../../../db/utils" @@ -73,12 +74,15 @@ export function basicProcessing({ // filter the row down to what is actually the row (not joined) for (let field of Object.values(table.schema)) { const fieldName = field.name - const value = extractFieldValue({ + let value = extractFieldValue({ row, tableName: table.name, fieldName, isLinked, }) + if (value instanceof Buffer) { + value = value.toString() + } // all responses include "select col as table.col" so that overlaps are handled if (value != null) { thisRow[fieldName] = value @@ -104,12 +108,17 @@ export function basicProcessing({ export function fixArrayTypes(row: Row, table: Table) { for (let [fieldName, schema] of Object.entries(table.schema)) { - if (schema.type === FieldType.ARRAY && typeof row[fieldName] === "string") { + if ( + [FieldType.ARRAY, FieldType.BB_REFERENCE].includes(schema.type) && + typeof row[fieldName] === "string" + ) { try { row[fieldName] = JSON.parse(row[fieldName]) } catch (err) { - // couldn't convert back to array, ignore - delete row[fieldName] + if (!helpers.schema.isDeprecatedSingleUserColumn(schema)) { + // couldn't convert back to array, ignore + delete row[fieldName] + } } } } diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts index bf9ede6fe3..c2d62e0204 100644 --- a/packages/server/src/api/controllers/row/utils/utils.ts +++ b/packages/server/src/api/controllers/row/utils/utils.ts @@ -22,7 +22,7 @@ import { getInternalRowId, } from "./basic" import sdk from "../../../../sdk" - +import { processStringSync } from "@budibase/string-templates" import validateJs from "validate.js" validateJs.extend(validateJs.validators.datetime, { @@ -117,6 +117,19 @@ export async function validate( }) } +function fixBooleanFields({ row, table }: { row: Row; table: Table }) { + for (let col of Object.values(table.schema)) { + if (col.type === FieldType.BOOLEAN) { + if (row[col.name] === 1) { + row[col.name] = true + } else if (row[col.name] === 0) { + row[col.name] = false + } + } + } + return row +} + export async function sqlOutputProcessing( rows: DatasourcePlusQueryResponse, table: Table, @@ -161,7 +174,9 @@ export async function sqlOutputProcessing( if (thisRow._id == null) { throw new Error("Unable to generate row ID for SQL rows") } - finalRows[thisRow._id] = thisRow + + finalRows[thisRow._id] = fixBooleanFields({ row: thisRow, table }) + // do this at end once its been added to the final rows finalRows = await updateRelationshipColumns( table, @@ -189,3 +204,63 @@ export async function sqlOutputProcessing( export function isUserMetadataTable(tableId: string) { return tableId === InternalTables.USER_METADATA } + +export async function enrichArrayContext( + fields: any[], + inputs = {}, + helpers = true +): Promise { + const map: Record = {} + for (let index in fields) { + map[index] = fields[index] + } + const output = await enrichSearchContext(map, inputs, helpers) + const outputArray: any[] = [] + for (let [key, value] of Object.entries(output)) { + outputArray[parseInt(key)] = value + } + return outputArray +} + +export async function enrichSearchContext( + fields: Record, + inputs = {}, + helpers = true +): Promise> { + const enrichedQuery: Record = {} + if (!fields || !inputs) { + return enrichedQuery + } + const parameters = { ...inputs } + + if (Array.isArray(fields)) { + return enrichArrayContext(fields, inputs, helpers) + } + + // enrich the fields with dynamic parameters + for (let key of Object.keys(fields)) { + if (fields[key] == null) { + enrichedQuery[key] = null + continue + } + if (typeof fields[key] === "object") { + // enrich nested fields object + enrichedQuery[key] = await enrichSearchContext( + fields[key], + parameters, + helpers + ) + } else if (typeof fields[key] === "string") { + // enrich string value as normal + enrichedQuery[key] = processStringSync(fields[key], parameters, { + noEscaping: true, + noHelpers: !helpers, + escapeNewlines: true, + }) + } else { + enrichedQuery[key] = fields[key] + } + } + + return enrichedQuery +} diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts index 2644446d82..5237ca712a 100644 --- a/packages/server/src/api/controllers/row/views.ts +++ b/packages/server/src/api/controllers/row/views.ts @@ -9,7 +9,8 @@ import { } from "@budibase/types" import { dataFilters } from "@budibase/shared-core" import sdk from "../../../sdk" -import { db } from "@budibase/backend-core" +import { db, context } from "@budibase/backend-core" +import { enrichSearchContext } from "./utils" export async function searchView( ctx: UserCtx @@ -56,10 +57,16 @@ export async function searchView( }) } + await context.ensureSnippetContext(true) + + const enrichedQuery = await enrichSearchContext(query, { + user: sdk.users.getUserContextBindings(ctx.user), + }) + const searchOptions: RequiredKeys & RequiredKeys> = { tableId: view.tableId, - query, + query: enrichedQuery, fields: viewFields, ...getSortOptions(body, view), limit: body.limit, diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index 63ce00c5ef..eae5204c7e 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -180,5 +180,5 @@ export async function migrate(ctx: UserCtx) { } ctx.status = 200 - ctx.body = { message: `Column ${oldColumn.name} migrated.` } + ctx.body = { message: `Column ${oldColumn} migrated.` } } diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index f496c686f3..8eac30e4df 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -128,6 +128,7 @@ export async function importToRows( for (let i = 0; i < data.length; i++) { let row = data[i] row._id = generateRowID(table._id!) + row.type = "row" row.tableId = table._id // We use a reference to table here and update it after input processing, diff --git a/packages/server/src/api/routes/tests/attachment.spec.ts b/packages/server/src/api/routes/tests/attachment.spec.ts index aa02ea898e..7ff4e67bcc 100644 --- a/packages/server/src/api/routes/tests/attachment.spec.ts +++ b/packages/server/src/api/routes/tests/attachment.spec.ts @@ -4,10 +4,12 @@ import { APIError } from "@budibase/types" describe("/api/applications/:appId/sync", () => { let config = setup.getConfig() - afterAll(setup.afterAll) beforeAll(async () => { await config.init() }) + afterAll(async () => { + setup.afterAll() + }) describe("/api/attachments/process", () => { it("should accept an image file upload", async () => { @@ -18,7 +20,8 @@ describe("/api/applications/:appId/sync", () => { expect(resp.length).toBe(1) let upload = resp[0] - expect(upload.url.endsWith(".jpg")).toBe(true) + + expect(upload.url.split("?")[0].endsWith(".jpg")).toBe(true) expect(upload.extension).toBe("jpg") expect(upload.size).toBe(1) expect(upload.name).toBe("1px.jpg") diff --git a/packages/server/src/api/routes/tests/backup.spec.ts b/packages/server/src/api/routes/tests/backup.spec.ts index 7b56145f8e..78354dfe9c 100644 --- a/packages/server/src/api/routes/tests/backup.spec.ts +++ b/packages/server/src/api/routes/tests/backup.spec.ts @@ -1,16 +1,18 @@ +import { mocks } from "@budibase/backend-core/tests" import tk from "timekeeper" import * as setup from "./utilities" import { events } from "@budibase/backend-core" import sdk from "../../../sdk" import { checkBuilderEndpoint } from "./utilities/TestFunctions" -import { mocks } from "@budibase/backend-core/tests" mocks.licenses.useBackups() describe("/backups", () => { let config = setup.getConfig() - afterAll(setup.afterAll) + afterAll(async () => { + setup.afterAll() + }) beforeEach(async () => { tk.reset() diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts index d5c0a256a1..f2cea90675 100644 --- a/packages/server/src/api/routes/tests/datasource.spec.ts +++ b/packages/server/src/api/routes/tests/datasource.spec.ts @@ -9,13 +9,14 @@ import { mocks } from "@budibase/backend-core/tests" import { Datasource, FieldSchema, - FieldSubtype, + BBReferenceFieldSubType, FieldType, QueryPreview, RelationshipType, SourceName, Table, TableSchema, + SupportedSqlTypes, } from "@budibase/types" import { DatabaseName, getDatasource } from "../../../integrations/tests/utils" import { tableForDatasource } from "../../../tests/utilities/structures" @@ -261,20 +262,6 @@ describe("/datasources", () => { }) ) - type SupportedSqlTypes = - | FieldType.STRING - | FieldType.BARCODEQR - | FieldType.LONGFORM - | FieldType.OPTIONS - | FieldType.DATETIME - | FieldType.NUMBER - | FieldType.BOOLEAN - | FieldType.FORMULA - | FieldType.BIGINT - | FieldType.BB_REFERENCE - | FieldType.LINK - | FieldType.ARRAY - const fullSchema: { [type in SupportedSqlTypes]: FieldSchema & { type: type } } = { @@ -337,7 +324,12 @@ describe("/datasources", () => { [FieldType.BB_REFERENCE]: { name: "bb_reference", type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, + subtype: BBReferenceFieldSubType.USER, + }, + [FieldType.BB_REFERENCE_SINGLE]: { + name: "bb_reference_single", + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, }, } diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index 8e1014f825..83041cbef6 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -13,7 +13,7 @@ import { DeleteRow, FieldSchema, FieldType, - FieldTypeSubtypes, + BBReferenceFieldSubType, FormulaType, INTERNAL_TABLE_SOURCE_ID, NumberFieldMetadata, @@ -32,8 +32,6 @@ import * as uuid from "uuid" const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString() tk.freeze(timestamp) -jest.unmock("mssql") - describe.each([ ["internal", undefined], [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)], @@ -131,7 +129,13 @@ describe.each([ const assertRowUsage = async (expected: number) => { const usage = await getRowUsage() - expect(usage).toBe(expected) + + // Because our quota tracking is not perfect, we allow a 10% margin of + // error. This is to account for the fact that parallel writes can result + // in some quota updates getting lost. We don't have any need to solve this + // right now, so we just allow for some error. + expect(usage).toBeGreaterThan(expected * 0.9) + expect(usage).toBeLessThan(expected * 1.1) } const defaultRowFields = isInternal @@ -194,39 +198,99 @@ describe.each([ await assertRowUsage(rowUsage) }) - it("increment row autoId per create row request", async () => { - const rowUsage = await getRowUsage() + isInternal && + it("increment row autoId per create row request", async () => { + const rowUsage = await getRowUsage() - const newTable = await config.api.table.save( - saveTableRequest({ - schema: { - "Row ID": { - name: "Row ID", - type: FieldType.NUMBER, - subtype: AutoFieldSubType.AUTO_ID, - icon: "ri-magic-line", - autocolumn: true, - constraints: { - type: "number", - presence: true, - numericality: { - greaterThanOrEqualTo: "", - lessThanOrEqualTo: "", + const newTable = await config.api.table.save( + saveTableRequest({ + schema: { + "Row ID": { + name: "Row ID", + type: FieldType.NUMBER, + subtype: AutoFieldSubType.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: "number", + presence: true, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, }, }, }, - }, - }) - ) + }) + ) - let previousId = 0 - for (let i = 0; i < 10; i++) { - const row = await config.api.row.save(newTable._id!, {}) - expect(row["Row ID"]).toBeGreaterThan(previousId) - previousId = row["Row ID"] - } - await assertRowUsage(rowUsage + 10) - }) + let previousId = 0 + for (let i = 0; i < 10; i++) { + const row = await config.api.row.save(newTable._id!, {}) + expect(row["Row ID"]).toBeGreaterThan(previousId) + previousId = row["Row ID"] + } + await assertRowUsage(rowUsage + 10) + }) + + isInternal && + it("should increment auto ID correctly when creating rows in parallel", async () => { + const table = await config.api.table.save( + saveTableRequest({ + schema: { + "Row ID": { + name: "Row ID", + type: FieldType.NUMBER, + subtype: AutoFieldSubType.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: "number", + presence: true, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + }, + }, + }) + ) + + const sequence = Array(50) + .fill(0) + .map((_, i) => i + 1) + + // This block of code is simulating users creating auto ID rows at the + // same time. It's expected that this operation will sometimes return + // a document conflict error (409), but the idea is to retry in those + // situations. The code below does this a large number of times with + // small, random delays between them to try and get through the list + // as quickly as possible. + await Promise.all( + sequence.map(async () => { + const attempts = 20 + for (let attempt = 0; attempt < attempts; attempt++) { + try { + await config.api.row.save(table._id!, {}) + return + } catch (e) { + await new Promise(r => setTimeout(r, Math.random() * 15)) + } + } + throw new Error(`Failed to create row after ${attempts} attempts`) + }) + ) + + const rows = await config.api.row.fetch(table._id!) + expect(rows).toHaveLength(50) + + // The main purpose of this test is to ensure that even under pressure, + // we maintain data integrity. An auto ID column should hand out + // monotonically increasing unique integers no matter what. + const ids = rows.map(r => r["Row ID"]) + expect(ids).toEqual(expect.arrayContaining(sequence)) + }) isInternal && it("row values are coerced", async () => { @@ -856,7 +920,7 @@ describe.each([ await config.withEnv({ SELF_HOSTED: "true" }, async () => { return context.doInAppContext(config.getAppId(), async () => { const enriched = await outputProcessing(table, [row]) - expect((enriched as Row[])[0].attachment.url).toBe( + expect((enriched as Row[])[0].attachment.url.split("?")[0]).toBe( `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}` ) }) @@ -889,7 +953,7 @@ describe.each([ await config.withEnv({ SELF_HOSTED: "true" }, async () => { return context.doInAppContext(config.getAppId(), async () => { const enriched = await outputProcessing(table, [row]) - expect((enriched as Row[])[0].attachment[0].url).toBe( + expect((enriched as Row[])[0].attachment[0].url.split("?")[0]).toBe( `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}` ) }) @@ -1015,12 +1079,12 @@ describe.each([ user: { name: "user", type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: BBReferenceFieldSubType.USER, }, users: { name: "users", type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USERS, + subtype: BBReferenceFieldSubType.USERS, }, }), () => config.createUser(), diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts index 698ea0c10b..87d0aa72c7 100644 --- a/packages/server/src/api/routes/tests/search.spec.ts +++ b/packages/server/src/api/routes/tests/search.spec.ts @@ -1,10 +1,13 @@ import { tableForDatasource } from "../../../tests/utilities/structures" import { DatabaseName, getDatasource } from "../../../integrations/tests/utils" +import { db as dbCore } from "@budibase/backend-core" import * as setup from "./utilities" import { + AutoFieldSubType, Datasource, EmptyFilterOption, + BBReferenceFieldSubType, FieldType, RowSearchParams, SearchFilters, @@ -12,32 +15,51 @@ import { SortType, Table, TableSchema, + User, } from "@budibase/types" import _ from "lodash" +import tk from "timekeeper" +import { encodeJSBinding } from "@budibase/string-templates" -jest.unmock("mssql") +const serverTime = new Date("2024-05-06T00:00:00.000Z") +tk.freeze(serverTime) describe.each([ - ["internal", undefined], - ["internal-sqs", undefined], + ["lucene", undefined], + ["sqs", undefined], [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)], [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)], [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)], [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)], ])("/api/:sourceId/search (%s)", (name, dsProvider) => { - const isSqs = name === "internal-sqs" - const isInternal = name === "internal" + const isSqs = name === "sqs" + const isLucene = name === "lucene" + const isInternal = isSqs || isLucene const config = setup.getConfig() let envCleanup: (() => void) | undefined let datasource: Datasource | undefined let table: Table + const snippets = [ + { + name: "WeeksAgo", + code: `return function (weeks) {\n const currentTime = new Date(${Date.now()});\n currentTime.setDate(currentTime.getDate()-(7 * (weeks || 1)));\n return currentTime.toISOString();\n}`, + }, + ] + beforeAll(async () => { if (isSqs) { envCleanup = config.setEnv({ SQS_SEARCH_ENABLE: "true" }) } await config.init() + + if (config.app?.appId) { + config.app = await config.api.application.update(config.app?.appId, { + snippets, + }) + } + if (dsProvider) { datasource = await config.createDatasource({ datasource: await dsProvider, @@ -59,12 +81,28 @@ describe.each([ } async function createRows(rows: Record[]) { - await Promise.all(rows.map(r => config.api.row.save(table._id!, r))) + await config.api.row.bulkImport(table._id!, { rows }) } class SearchAssertion { constructor(private readonly query: RowSearchParams) {} + private findRow(expectedRow: any, foundRows: any[]) { + const row = foundRows.find(foundRow => _.isMatch(foundRow, expectedRow)) + if (!row) { + const fields = Object.keys(expectedRow) + // To make the error message more readable, we only include the fields + // that are present in the expected row. + const searchedObjects = foundRows.map(row => _.pick(row, fields)) + throw new Error( + `Failed to find row: ${JSON.stringify( + expectedRow + )} in ${JSON.stringify(searchedObjects)}` + ) + } + return row + } + // Asserts that the query returns rows matching exactly the set of rows // passed in. The order of the rows matters. Rows returned in an order // different to the one passed in will cause the assertion to fail. Extra @@ -80,9 +118,7 @@ describe.each([ // eslint-disable-next-line jest/no-standalone-expect expect(foundRows).toEqual( expectedRows.map((expectedRow: any) => - expect.objectContaining( - foundRows.find(foundRow => _.isMatch(foundRow, expectedRow)) - ) + expect.objectContaining(this.findRow(expectedRow, foundRows)) ) ) } @@ -102,9 +138,7 @@ describe.each([ expect(foundRows).toEqual( expect.arrayContaining( expectedRows.map((expectedRow: any) => - expect.objectContaining( - foundRows.find(foundRow => _.isMatch(foundRow, expectedRow)) - ) + expect.objectContaining(this.findRow(expectedRow, foundRows)) ) ) ) @@ -123,9 +157,7 @@ describe.each([ expect(foundRows).toEqual( expect.arrayContaining( expectedRows.map((expectedRow: any) => - expect.objectContaining( - foundRows.find(foundRow => _.isMatch(foundRow, expectedRow)) - ) + expect.objectContaining(this.findRow(expectedRow, foundRows)) ) ) ) @@ -154,7 +186,406 @@ describe.each([ return expectSearch({ query }) } - describe("strings", () => { + describe("boolean", () => { + beforeAll(async () => { + await createTable({ + isTrue: { name: "isTrue", type: FieldType.BOOLEAN }, + }) + await createRows([{ isTrue: true }, { isTrue: false }]) + }) + + describe("equal", () => { + it("successfully finds true row", () => + expectQuery({ equal: { isTrue: true } }).toMatchExactly([ + { isTrue: true }, + ])) + + it("successfully finds false row", () => + expectQuery({ equal: { isTrue: false } }).toMatchExactly([ + { isTrue: false }, + ])) + }) + + describe("notEqual", () => { + it("successfully finds false row", () => + expectQuery({ notEqual: { isTrue: true } }).toContainExactly([ + { isTrue: false }, + ])) + + it("successfully finds true row", () => + expectQuery({ notEqual: { isTrue: false } }).toContainExactly([ + { isTrue: true }, + ])) + }) + + describe("oneOf", () => { + it("successfully finds true row", () => + expectQuery({ oneOf: { isTrue: [true] } }).toContainExactly([ + { isTrue: true }, + ])) + + it("successfully finds false row", () => + expectQuery({ oneOf: { isTrue: [false] } }).toContainExactly([ + { isTrue: false }, + ])) + }) + + describe("sort", () => { + it("sorts ascending", () => + expectSearch({ + query: {}, + sort: "isTrue", + sortOrder: SortOrder.ASCENDING, + }).toMatchExactly([{ isTrue: false }, { isTrue: true }])) + + it("sorts descending", () => + expectSearch({ + query: {}, + sort: "isTrue", + sortOrder: SortOrder.DESCENDING, + }).toMatchExactly([{ isTrue: true }, { isTrue: false }])) + }) + }) + + // Ensure all bindings resolve and perform as expected + describe("bindings", () => { + let globalUsers: any = [] + + const future = new Date(serverTime.getTime()) + future.setDate(future.getDate() + 30) + + const rows = (currentUser: User) => { + return [ + { name: "foo", appointment: "1982-01-05T00:00:00.000Z" }, + { name: "bar", appointment: "1995-05-06T00:00:00.000Z" }, + { name: currentUser.firstName, appointment: future.toISOString() }, + { name: "serverDate", appointment: serverTime.toISOString() }, + { + name: "single user, session user", + single_user: JSON.stringify(currentUser), + }, + { + name: "single user", + single_user: JSON.stringify(globalUsers[0]), + }, + { + name: "deprecated single user, session user", + deprecated_single_user: JSON.stringify([currentUser]), + }, + { + name: "deprecated single user", + deprecated_single_user: JSON.stringify([globalUsers[0]]), + }, + { + name: "multi user", + multi_user: JSON.stringify(globalUsers), + }, + { + name: "multi user with session user", + multi_user: JSON.stringify([...globalUsers, currentUser]), + }, + { + name: "deprecated multi user", + deprecated_multi_user: JSON.stringify(globalUsers), + }, + { + name: "deprecated multi user with session user", + deprecated_multi_user: JSON.stringify([...globalUsers, currentUser]), + }, + ] + } + + beforeAll(async () => { + // Set up some global users + globalUsers = await Promise.all( + Array(2) + .fill(0) + .map(async () => { + const globalUser = await config.globalUser() + const userMedataId = globalUser._id + ? dbCore.generateUserMetadataID(globalUser._id) + : null + return { + _id: globalUser._id, + _meta: userMedataId, + } + }) + ) + + await createTable({ + name: { name: "name", type: FieldType.STRING }, + appointment: { name: "appointment", type: FieldType.DATETIME }, + single_user: { + name: "single_user", + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, + }, + deprecated_single_user: { + name: "deprecated_single_user", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + }, + multi_user: { + name: "multi_user", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + constraints: { + type: "array", + }, + }, + deprecated_multi_user: { + name: "deprecated_multi_user", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USERS, + constraints: { + type: "array", + }, + }, + }) + await createRows(rows(config.getUser())) + }) + + // !! Current User is auto generated per run + it("should return all rows matching the session user firstname", async () => { + await expectQuery({ + equal: { name: "{{ [user].firstName }}" }, + }).toContainExactly([ + { + name: config.getUser().firstName, + appointment: future.toISOString(), + }, + ]) + }) + + it("should parse the date binding and return all rows after the resolved value", async () => { + await expectQuery({ + range: { + appointment: { + low: "{{ [now] }}", + high: "9999-00-00T00:00:00.000Z", + }, + }, + }).toContainExactly([ + { + name: config.getUser().firstName, + appointment: future.toISOString(), + }, + { name: "serverDate", appointment: serverTime.toISOString() }, + ]) + }) + + it("should parse the date binding and return all rows before the resolved value", async () => { + await expectQuery({ + range: { + appointment: { + low: "0000-00-00T00:00:00.000Z", + high: "{{ [now] }}", + }, + }, + }).toContainExactly([ + { name: "foo", appointment: "1982-01-05T00:00:00.000Z" }, + { name: "bar", appointment: "1995-05-06T00:00:00.000Z" }, + { name: "serverDate", appointment: serverTime.toISOString() }, + ]) + }) + + it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => { + const jsBinding = "return snippets.WeeksAgo();" + const encodedBinding = encodeJSBinding(jsBinding) + + await expectQuery({ + range: { + appointment: { + low: "0000-00-00T00:00:00.000Z", + high: encodedBinding, + }, + }, + }).toContainExactly([ + { name: "foo", appointment: "1982-01-05T00:00:00.000Z" }, + { name: "bar", appointment: "1995-05-06T00:00:00.000Z" }, + ]) + }) + + it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => { + const jsBinding = + "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();" + const encodedBinding = encodeJSBinding(jsBinding) + + await expectQuery({ + range: { + appointment: { + low: "0000-00-00T00:00:00.000Z", + high: encodedBinding, + }, + }, + }).toContainExactly([ + { name: "foo", appointment: "1982-01-05T00:00:00.000Z" }, + { name: "bar", appointment: "1995-05-06T00:00:00.000Z" }, + ]) + }) + + it("should match a single user row by the session user id", async () => { + await expectQuery({ + equal: { single_user: "{{ [user]._id }}" }, + }).toContainExactly([ + { + name: "single user, session user", + single_user: { _id: config.getUser()._id }, + }, + ]) + }) + + it("should match a deprecated single user row by the session user id", async () => { + await expectQuery({ + equal: { deprecated_single_user: "{{ [user]._id }}" }, + }).toContainExactly([ + { + name: "deprecated single user, session user", + deprecated_single_user: [{ _id: config.getUser()._id }], + }, + ]) + }) + + // TODO(samwho): fix for SQS + !isSqs && + it("should match the session user id in a multi user field", async () => { + const allUsers = [...globalUsers, config.getUser()].map((user: any) => { + return { _id: user._id } + }) + + await expectQuery({ + contains: { multi_user: ["{{ [user]._id }}"] }, + }).toContainExactly([ + { + name: "multi user with session user", + multi_user: allUsers, + }, + ]) + }) + + // TODO(samwho): fix for SQS + !isSqs && + it("should match the session user id in a deprecated multi user field", async () => { + const allUsers = [...globalUsers, config.getUser()].map((user: any) => { + return { _id: user._id } + }) + + await expectQuery({ + contains: { deprecated_multi_user: ["{{ [user]._id }}"] }, + }).toContainExactly([ + { + name: "deprecated multi user with session user", + deprecated_multi_user: allUsers, + }, + ]) + }) + + // TODO(samwho): fix for SQS + !isSqs && + it("should not match the session user id in a multi user field", async () => { + await expectQuery({ + notContains: { multi_user: ["{{ [user]._id }}"] }, + notEmpty: { multi_user: true }, + }).toContainExactly([ + { + name: "multi user", + multi_user: globalUsers.map((user: any) => { + return { _id: user._id } + }), + }, + ]) + }) + + // TODO(samwho): fix for SQS + !isSqs && + it("should not match the session user id in a deprecated multi user field", async () => { + await expectQuery({ + notContains: { deprecated_multi_user: ["{{ [user]._id }}"] }, + notEmpty: { deprecated_multi_user: true }, + }).toContainExactly([ + { + name: "deprecated multi user", + deprecated_multi_user: globalUsers.map((user: any) => { + return { _id: user._id } + }), + }, + ]) + }) + + it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => { + await expectQuery({ + oneOf: { + single_user: [ + "{{ default [user]._id '_empty_' }}", + globalUsers[0]._id, + ], + }, + }).toContainExactly([ + { + name: "single user, session user", + single_user: { _id: config.getUser()._id }, + }, + { + name: "single user", + single_user: { _id: globalUsers[0]._id }, + }, + ]) + }) + + it("should match the session user id and a user table row id using helpers, user binding and a static user id. (deprecated single user)", async () => { + await expectQuery({ + oneOf: { + deprecated_single_user: [ + "{{ default [user]._id '_empty_' }}", + globalUsers[0]._id, + ], + }, + }).toContainExactly([ + { + name: "deprecated single user, session user", + deprecated_single_user: [{ _id: config.getUser()._id }], + }, + { + name: "deprecated single user", + deprecated_single_user: [{ _id: globalUsers[0]._id }], + }, + ]) + }) + + it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => { + await expectQuery({ + oneOf: { + single_user: [ + "{{ default [user]._idx '_empty_' }}", + globalUsers[0]._id, + ], + }, + }).toContainExactly([ + { + name: "single user", + single_user: { _id: globalUsers[0]._id }, + }, + ]) + }) + + it("should resolve 'default' helper to '_empty_' when binding resolves to nothing (deprecated single user)", async () => { + await expectQuery({ + oneOf: { + deprecated_single_user: [ + "{{ default [user]._idx '_empty_' }}", + globalUsers[0]._id, + ], + }, + }).toContainExactly([ + { + name: "deprecated single user", + deprecated_single_user: [{ _id: globalUsers[0]._id }], + }, + ]) + }) + }) + + describe.each([FieldType.STRING, FieldType.LONGFORM])("%s", () => { beforeAll(async () => { await createTable({ name: { name: "name", type: FieldType.STRING }, @@ -250,6 +681,31 @@ describe.each([ }).toFindNothing()) }) + describe("empty", () => { + it("finds no empty rows", () => + expectQuery({ empty: { name: null } }).toFindNothing()) + + it("should not be affected by when filter empty behaviour", () => + expectQuery({ + empty: { name: null }, + onEmptyFilter: EmptyFilterOption.RETURN_ALL, + }).toFindNothing()) + }) + + describe("notEmpty", () => { + it("finds all non-empty rows", () => + expectQuery({ notEmpty: { name: null } }).toContainExactly([ + { name: "foo" }, + { name: "bar" }, + ])) + + it("should not be affected by when filter empty behaviour", () => + expectQuery({ + notEmpty: { name: null }, + onEmptyFilter: EmptyFilterOption.RETURN_NONE, + }).toContainExactly([{ name: "foo" }, { name: "bar" }])) + }) + describe("sort", () => { it("sorts ascending", () => expectSearch({ @@ -339,14 +795,14 @@ describe.each([ }).toFindNothing()) // We never implemented half-open ranges in Lucene. - !isInternal && + !isLucene && it("can search using just a low value", () => expectQuery({ range: { age: { low: 5 } }, }).toContainExactly([{ age: 10 }])) // We never implemented half-open ranges in Lucene. - !isInternal && + !isLucene && it("can search using just a high value", () => expectQuery({ range: { age: { high: 5 } }, @@ -457,14 +913,14 @@ describe.each([ }).toFindNothing()) // We never implemented half-open ranges in Lucene. - !isInternal && + !isLucene && it("can search using just a low value", () => expectQuery({ range: { dob: { low: JAN_5TH } }, }).toContainExactly([{ dob: JAN_10TH }])) // We never implemented half-open ranges in Lucene. - !isInternal && + !isLucene && it("can search using just a high value", () => expectQuery({ range: { dob: { high: JAN_5TH } }, @@ -506,7 +962,7 @@ describe.each([ }) }) - describe("array of strings", () => { + describe.each([FieldType.ARRAY, FieldType.OPTIONS])("%s", () => { beforeAll(async () => { await createTable({ numbers: { @@ -642,7 +1098,7 @@ describe.each([ // Range searches against bigints don't seem to work at all in Lucene, and I // couldn't figure out why. Given that we're replacing Lucene with SQS, // we've decided not to spend time on it. - !isInternal && + !isLucene && describe("range", () => { it("successfully finds a row", () => expectQuery({ @@ -675,4 +1131,137 @@ describe.each([ }).toContainExactly([{ num: SMALL }, { num: MEDIUM }])) }) }) + + isInternal && + describe("auto", () => { + beforeAll(async () => { + await createTable({ + auto: { + name: "auto", + type: FieldType.AUTO, + autocolumn: true, + subtype: AutoFieldSubType.AUTO_ID, + }, + }) + await createRows(new Array(10).fill({})) + }) + + describe("equal", () => { + it("successfully finds a row", () => + expectQuery({ equal: { auto: 1 } }).toContainExactly([{ auto: 1 }])) + + it("fails to find nonexistent row", () => + expectQuery({ equal: { auto: 0 } }).toFindNothing()) + }) + + describe("not equal", () => { + it("successfully finds a row", () => + expectQuery({ notEqual: { auto: 1 } }).toContainExactly([ + { auto: 2 }, + { auto: 3 }, + { auto: 4 }, + { auto: 5 }, + { auto: 6 }, + { auto: 7 }, + { auto: 8 }, + { auto: 9 }, + { auto: 10 }, + ])) + + it("fails to find nonexistent row", () => + expectQuery({ notEqual: { auto: 0 } }).toContainExactly([ + { auto: 1 }, + { auto: 2 }, + { auto: 3 }, + { auto: 4 }, + { auto: 5 }, + { auto: 6 }, + { auto: 7 }, + { auto: 8 }, + { auto: 9 }, + { auto: 10 }, + ])) + }) + + describe("oneOf", () => { + it("successfully finds a row", () => + expectQuery({ oneOf: { auto: [1] } }).toContainExactly([{ auto: 1 }])) + + it("fails to find nonexistent row", () => + expectQuery({ oneOf: { auto: [0] } }).toFindNothing()) + }) + + describe("range", () => { + it("successfully finds a row", () => + expectQuery({ + range: { auto: { low: 1, high: 1 } }, + }).toContainExactly([{ auto: 1 }])) + + it("successfully finds multiple rows", () => + expectQuery({ + range: { auto: { low: 1, high: 2 } }, + }).toContainExactly([{ auto: 1 }, { auto: 2 }])) + + it("successfully finds a row with a high bound", () => + expectQuery({ + range: { auto: { low: 2, high: 2 } }, + }).toContainExactly([{ auto: 2 }])) + + it("successfully finds no rows", () => + expectQuery({ + range: { auto: { low: 0, high: 0 } }, + }).toFindNothing()) + + isSqs && + it("can search using just a low value", () => + expectQuery({ + range: { auto: { low: 9 } }, + }).toContainExactly([{ auto: 9 }, { auto: 10 }])) + + isSqs && + it("can search using just a high value", () => + expectQuery({ + range: { auto: { high: 2 } }, + }).toContainExactly([{ auto: 1 }, { auto: 2 }])) + }) + + isSqs && + describe("sort", () => { + it("sorts ascending", () => + expectSearch({ + query: {}, + sort: "auto", + sortOrder: SortOrder.ASCENDING, + }).toMatchExactly([ + { auto: 1 }, + { auto: 2 }, + { auto: 3 }, + { auto: 4 }, + { auto: 5 }, + { auto: 6 }, + { auto: 7 }, + { auto: 8 }, + { auto: 9 }, + { auto: 10 }, + ])) + + it("sorts descending", () => + expectSearch({ + query: {}, + sort: "auto", + sortOrder: SortOrder.DESCENDING, + }).toMatchExactly([ + { auto: 10 }, + { auto: 9 }, + { auto: 8 }, + { auto: 7 }, + { auto: 6 }, + { auto: 5 }, + { auto: 4 }, + { auto: 3 }, + { auto: 2 }, + { auto: 1 }, + ])) + }) + }) }) diff --git a/packages/server/src/api/routes/tests/static.spec.js b/packages/server/src/api/routes/tests/static.spec.js index 30417c3a98..1358b5418a 100644 --- a/packages/server/src/api/routes/tests/static.spec.js +++ b/packages/server/src/api/routes/tests/static.spec.js @@ -1,3 +1,13 @@ +// Directly mock the AWS SDK +jest.mock("aws-sdk", () => ({ + S3: jest.fn(() => ({ + getSignedUrl: jest.fn( + (operation, params) => `http://example.com/${params.Bucket}/${params.Key}` + ), + upload: jest.fn(() => ({ Contents: {} })), + })), +})) + const setup = require("./utilities") const { constants } = require("@budibase/backend-core") diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts index ede1e7af94..059b5cde72 100644 --- a/packages/server/src/api/routes/tests/table.spec.ts +++ b/packages/server/src/api/routes/tests/table.spec.ts @@ -1,8 +1,8 @@ import { context, events } from "@budibase/backend-core" import { AutoFieldSubType, + BBReferenceFieldSubType, Datasource, - FieldSubtype, FieldType, INTERNAL_TABLE_SOURCE_ID, InternalTable, @@ -149,58 +149,59 @@ describe.each([ expect(res.name).toBeUndefined() }) - it("updates only the passed fields", async () => { - await timekeeper.withFreeze(new Date(2021, 1, 1), async () => { - const table = await config.api.table.save( - tableForDatasource(datasource, { - schema: { - autoId: { - name: "id", - type: FieldType.NUMBER, - subtype: AutoFieldSubType.AUTO_ID, - autocolumn: true, - constraints: { - type: "number", - presence: false, + isInternal && + it("updates only the passed fields", async () => { + await timekeeper.withFreeze(new Date(2021, 1, 1), async () => { + const table = await config.api.table.save( + tableForDatasource(datasource, { + schema: { + autoId: { + name: "id", + type: FieldType.NUMBER, + subtype: AutoFieldSubType.AUTO_ID, + autocolumn: true, + constraints: { + type: "number", + presence: false, + }, }, }, - }, + }) + ) + + const newName = generator.guid() + + const updatedTable = await config.api.table.save({ + ...table, + name: newName, }) - ) - const newName = generator.guid() + let expected: Table = { + ...table, + name: newName, + _id: expect.any(String), + } + if (isInternal) { + expected._rev = expect.stringMatching(/^2-.+/) + } - const updatedTable = await config.api.table.save({ - ...table, - name: newName, + expect(updatedTable).toEqual(expected) + + const persistedTable = await config.api.table.get(updatedTable._id!) + expected = { + ...table, + name: newName, + _id: updatedTable._id, + } + if (datasource?.isSQL) { + expected.sql = true + } + if (isInternal) { + expected._rev = expect.stringMatching(/^2-.+/) + } + expect(persistedTable).toEqual(expected) }) - - let expected: Table = { - ...table, - name: newName, - _id: expect.any(String), - } - if (isInternal) { - expected._rev = expect.stringMatching(/^2-.+/) - } - - expect(updatedTable).toEqual(expected) - - const persistedTable = await config.api.table.get(updatedTable._id!) - expected = { - ...table, - name: newName, - _id: updatedTable._id, - } - if (datasource?.isSQL) { - expected.sql = true - } - if (isInternal) { - expected._rev = expect.stringMatching(/^2-.+/) - } - expect(persistedTable).toEqual(expected) }) - }) describe("user table", () => { isInternal && @@ -214,6 +215,57 @@ describe.each([ }) }) + describe("external table validation", () => { + !isInternal && + it("should error if column is of type auto", async () => { + const table = basicTable(datasource) + await config.api.table.save( + { + ...table, + schema: { + ...table.schema, + auto: { + name: "auto", + autocolumn: true, + type: FieldType.AUTO, + }, + }, + }, + { + status: 400, + body: { + message: `Column "auto" has type "${FieldType.AUTO}" - this is not supported.`, + }, + } + ) + }) + + !isInternal && + it("should error if column has auto subtype", async () => { + const table = basicTable(datasource) + await config.api.table.save( + { + ...table, + schema: { + ...table.schema, + auto: { + name: "auto", + autocolumn: true, + type: FieldType.NUMBER, + subtype: AutoFieldSubType.AUTO_ID, + }, + }, + }, + { + status: 400, + body: { + message: `Column "auto" has subtype "${AutoFieldSubType.AUTO_ID}" - this is not supported.`, + }, + } + ) + }) + }) + it("should add a new column for an internal DB table", async () => { const saveTableRequest: SaveTableRequest = { ...basicTable(), @@ -493,16 +545,16 @@ describe.each([ ) await config.api.table.migrate(table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "user column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USER, - }, + oldColumn: "user relationship", + newColumn: "user column", }) const migratedTable = await config.api.table.get(table._id!) - expect(migratedTable.schema["user column"]).toBeDefined() + expect(migratedTable.schema["user column"]).toEqual({ + name: "user column", + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, + }) expect(migratedTable.schema["user relationship"]).not.toBeDefined() const migratedRows = await config.api.row.fetch(table._id!) @@ -515,7 +567,7 @@ describe.each([ expect(migratedRow["user column"]).toBeDefined() expect(migratedRow["user relationship"]).not.toBeDefined() expect(row["user relationship"][0]._id).toEqual( - migratedRow["user column"][0]._id + migratedRow["user column"]._id ) } }) @@ -558,16 +610,19 @@ describe.each([ ) await config.api.table.migrate(table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "user column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "user column", }) const migratedTable = await config.api.table.get(table._id!) - expect(migratedTable.schema["user column"]).toBeDefined() + expect(migratedTable.schema["user column"]).toEqual({ + name: "user column", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + constraints: { + type: "array", + }, + }) expect(migratedTable.schema["user relationship"]).not.toBeDefined() const migratedRow = await config.api.row.get(table._id!, testRow._id!) @@ -610,16 +665,19 @@ describe.each([ }) await config.api.table.migrate(table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "user column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "user column", }) const migratedTable = await config.api.table.get(table._id!) - expect(migratedTable.schema["user column"]).toBeDefined() + expect(migratedTable.schema["user column"]).toEqual({ + name: "user column", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + constraints: { + type: "array", + }, + }) expect(migratedTable.schema["user relationship"]).not.toBeDefined() const row1Migrated = await config.api.row.get(table._id!, row1._id!) @@ -665,16 +723,19 @@ describe.each([ }) await config.api.table.migrate(table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "user column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "user column", }) const migratedTable = await config.api.table.get(table._id!) - expect(migratedTable.schema["user column"]).toBeDefined() + expect(migratedTable.schema["user column"]).toEqual({ + name: "user column", + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + constraints: { + type: "array", + }, + }) expect(migratedTable.schema["user relationship"]).not.toBeDefined() const row1Migrated = await config.api.row.get(table._id!, row1._id!) @@ -724,12 +785,8 @@ describe.each([ await config.api.table.migrate( table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "", }, { status: 400 } ) @@ -739,12 +796,8 @@ describe.each([ await config.api.table.migrate( table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "_id", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "_id", }, { status: 400 } ) @@ -754,12 +807,8 @@ describe.each([ await config.api.table.migrate( table._id!, { - oldColumn: table.schema["user relationship"], - newColumn: { - name: "num", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "user relationship", + newColumn: "num", }, { status: 400 } ) @@ -769,16 +818,8 @@ describe.each([ await config.api.table.migrate( table._id!, { - oldColumn: { - name: "not a column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, - newColumn: { - name: "new column", - type: FieldType.BB_REFERENCE, - subtype: FieldSubtype.USERS, - }, + oldColumn: "not a column", + newColumn: "new column", }, { status: 400 } ) diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts index 3bc5ab722f..2ad02a8082 100644 --- a/packages/server/src/api/routes/tests/viewV2.spec.ts +++ b/packages/server/src/api/routes/tests/viewV2.spec.ts @@ -24,8 +24,6 @@ import merge from "lodash/merge" import { quotas } from "@budibase/pro" import { roles } from "@budibase/backend-core" -jest.unmock("mssql") - describe.each([ ["internal", undefined], [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)], diff --git a/packages/server/src/automations/automationUtils.ts b/packages/server/src/automations/automationUtils.ts index 6730e04494..c94c166be1 100644 --- a/packages/server/src/automations/automationUtils.ts +++ b/packages/server/src/automations/automationUtils.ts @@ -4,8 +4,11 @@ import { encodeJSBinding, } from "@budibase/string-templates" import sdk from "../sdk" -import { Row } from "@budibase/types" +import { AutomationAttachment, FieldType, Row } from "@budibase/types" import { LoopInput, LoopStepType } from "../definitions/automations" +import { objectStore, context } from "@budibase/backend-core" +import * as uuid from "uuid" +import path from "path" /** * When values are input to the system generally they will be of type string as this is required for template strings. @@ -96,6 +99,98 @@ export function getError(err: any) { return typeof err !== "string" ? err.toString() : err } +export async function sendAutomationAttachmentsToStorage( + tableId: string, + row: Row +): Promise { + const table = await sdk.tables.getTable(tableId) + const attachmentRows: Record< + string, + AutomationAttachment[] | AutomationAttachment + > = {} + + for (const [prop, value] of Object.entries(row)) { + const schema = table.schema[prop] + if ( + schema?.type === FieldType.ATTACHMENTS || + schema?.type === FieldType.ATTACHMENT_SINGLE + ) { + attachmentRows[prop] = value + } + } + for (const [prop, attachments] of Object.entries(attachmentRows)) { + if (Array.isArray(attachments)) { + if (attachments.length) { + row[prop] = await Promise.all( + attachments.map(attachment => generateAttachmentRow(attachment)) + ) + } + } else if (Object.keys(row[prop]).length > 0) { + row[prop] = await generateAttachmentRow(attachments) + } + } + + return row +} + +async function generateAttachmentRow(attachment: AutomationAttachment) { + const prodAppId = context.getProdAppId() + + async function uploadToS3( + extension: string, + content: objectStore.StreamTypes + ) { + const fileName = `${uuid.v4()}${extension}` + const s3Key = `${prodAppId}/attachments/${fileName}` + + await objectStore.streamUpload({ + bucket: objectStore.ObjectStoreBuckets.APPS, + stream: content, + filename: s3Key, + }) + + return s3Key + } + + async function getSize(s3Key: string) { + return ( + await objectStore.getObjectMetadata( + objectStore.ObjectStoreBuckets.APPS, + s3Key + ) + ).ContentLength + } + + try { + const { filename } = attachment + const extension = path.extname(filename) + const attachmentResult = await objectStore.processAutomationAttachment( + attachment + ) + + let s3Key = "" + if ( + "path" in attachmentResult && + attachmentResult.path.startsWith(`${prodAppId}/attachments/`) + ) { + s3Key = attachmentResult.path + } else { + s3Key = await uploadToS3(extension, attachmentResult.content) + } + + const size = await getSize(s3Key) + + return { + size, + name: filename, + extension, + key: s3Key, + } + } catch (error) { + console.error("Failed to process attachment:", error) + throw error + } +} export function substituteLoopStep(hbsString: string, substitute: string) { let checkForJS = isJSBinding(hbsString) let substitutedHbsString = "" diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts index d11baab5c6..5b5084b465 100644 --- a/packages/server/src/automations/steps/createRow.ts +++ b/packages/server/src/automations/steps/createRow.ts @@ -1,5 +1,9 @@ import { save } from "../../api/controllers/row" -import { cleanUpRow, getError } from "../automationUtils" +import { + cleanUpRow, + getError, + sendAutomationAttachmentsToStorage, +} from "../automationUtils" import { buildCtx } from "./utils" import { AutomationActionStepId, @@ -89,6 +93,10 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) { try { inputs.row = await cleanUpRow(inputs.row.tableId, inputs.row) + inputs.row = await sendAutomationAttachmentsToStorage( + inputs.row.tableId, + inputs.row + ) await save(ctx) return { row: inputs.row, diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts index fea3e981f3..348c5e8373 100644 --- a/packages/server/src/automations/steps/updateRow.ts +++ b/packages/server/src/automations/steps/updateRow.ts @@ -108,7 +108,15 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) { try { if (tableId) { - inputs.row = await automationUtils.cleanUpRow(tableId, inputs.row) + inputs.row = await automationUtils.cleanUpRow( + inputs.row.tableId, + inputs.row + ) + + inputs.row = await automationUtils.sendAutomationAttachmentsToStorage( + inputs.row.tableId, + inputs.row + ) } await rowController.patch(ctx) return { diff --git a/packages/server/src/automations/tests/createRow.spec.ts b/packages/server/src/automations/tests/createRow.spec.ts index 0098be39a5..e78236c5ac 100644 --- a/packages/server/src/automations/tests/createRow.spec.ts +++ b/packages/server/src/automations/tests/createRow.spec.ts @@ -1,5 +1,18 @@ import * as setup from "./utilities" +import { basicTableWithAttachmentField } from "../../tests/utilities/structures" +import { objectStore } from "@budibase/backend-core" +async function uploadTestFile(filename: string) { + let bucket = "testbucket" + await objectStore.upload({ + bucket, + filename, + body: Buffer.from("test data"), + }) + let presignedUrl = await objectStore.getPresignedUrl(bucket, filename, 60000) + + return presignedUrl +} describe("test the create row action", () => { let table: any let row: any @@ -43,4 +56,76 @@ describe("test the create row action", () => { const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, {}) expect(res.success).toEqual(false) }) + + it("should check that an attachment field is sent to storage and parsed", async () => { + let attachmentTable = await config.createTable( + basicTableWithAttachmentField() + ) + + let attachmentRow: any = { + tableId: attachmentTable._id, + } + + let filename = "test1.txt" + let presignedUrl = await uploadTestFile(filename) + let attachmentObject = [ + { + url: presignedUrl, + filename, + }, + ] + + attachmentRow.file_attachment = attachmentObject + const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, { + row: attachmentRow, + }) + + expect(res.success).toEqual(true) + expect(res.row.file_attachment[0]).toHaveProperty("key") + let s3Key = res.row.file_attachment[0].key + + const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS) + + const objectData = await client + .headObject({ Bucket: objectStore.ObjectStoreBuckets.APPS, Key: s3Key }) + .promise() + + expect(objectData).toBeDefined() + expect(objectData.ContentLength).toBeGreaterThan(0) + }) + + it("should check that an single attachment field is sent to storage and parsed", async () => { + let attachmentTable = await config.createTable( + basicTableWithAttachmentField() + ) + + let attachmentRow: any = { + tableId: attachmentTable._id, + } + + let filename = "test2.txt" + let presignedUrl = await uploadTestFile(filename) + let attachmentObject = { + url: presignedUrl, + filename, + } + + attachmentRow.single_file_attachment = attachmentObject + const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, { + row: attachmentRow, + }) + + expect(res.success).toEqual(true) + expect(res.row.single_file_attachment).toHaveProperty("key") + let s3Key = res.row.single_file_attachment.key + + const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS) + + const objectData = await client + .headObject({ Bucket: objectStore.ObjectStoreBuckets.APPS, Key: s3Key }) + .promise() + + expect(objectData).toBeDefined() + expect(objectData.ContentLength).toBeGreaterThan(0) + }) }) diff --git a/packages/server/src/automations/tests/executeQuery.spec.ts b/packages/server/src/automations/tests/executeQuery.spec.ts index 996e44af79..5a0688276d 100644 --- a/packages/server/src/automations/tests/executeQuery.spec.ts +++ b/packages/server/src/automations/tests/executeQuery.spec.ts @@ -88,7 +88,7 @@ describe.each( let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, { query: { queryId: "wrong_id" }, }) - expect(res.response).toEqual("Error: missing") + expect(res.response).toEqual("Error: CouchDB error: missing") expect(res.success).toEqual(false) }) }) diff --git a/packages/server/src/automations/tests/queryRows.spec.ts b/packages/server/src/automations/tests/queryRows.spec.ts index bee90df08e..6b9113a309 100644 --- a/packages/server/src/automations/tests/queryRows.spec.ts +++ b/packages/server/src/automations/tests/queryRows.spec.ts @@ -1,14 +1,4 @@ -// lucene searching not supported in test due to use of PouchDB -let rows: Row[] = [] -jest.mock("../../sdk/app/rows/search/internalSearch", () => ({ - fullSearch: jest.fn(() => { - return { - rows, - } - }), - paginatedSearch: jest.fn(), -})) -import { Row, Table } from "@budibase/types" +import { Table } from "@budibase/types" import * as setup from "./utilities" const NAME = "Test" @@ -25,8 +15,8 @@ describe("Test a query step automation", () => { description: "original description", tableId: table._id, } - rows.push(await config.createRow(row)) - rows.push(await config.createRow(row)) + await config.createRow(row) + await config.createRow(row) }) afterAll(setup.afterAll) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index cf80f2359f..ec4cb90a86 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -1200,4 +1200,38 @@ describe("postgres integrations", () => { expect(Object.keys(schema).sort()).toEqual(["id", "val1"]) }) }) + + describe("check custom column types", () => { + beforeAll(async () => { + await rawQuery( + rawDatasource, + `CREATE TABLE binaryTable ( + id BYTEA PRIMARY KEY, + column1 TEXT, + column2 INT + ); + ` + ) + }) + + it("should handle binary columns", async () => { + const response = await makeRequest( + "post", + `/api/datasources/${datasource._id}/schema` + ) + expect(response.body).toBeDefined() + expect(response.body.datasource.entities).toBeDefined() + const table = response.body.datasource.entities["binarytable"] + expect(table).toBeDefined() + expect(table.schema.id.externalType).toBe("bytea") + const row = await config.api.row.save(table._id, { + id: "1111", + column1: "hello", + column2: 222, + }) + expect(row._id).toBeDefined() + const decoded = decodeURIComponent(row._id!).replace(/'/g, '"') + expect(JSON.parse(decoded)[0]).toBe("1111") + }) + }) }) diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 28b7eb910b..85db642e47 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -12,7 +12,6 @@ import SqlTableQueryBuilder from "./sqlTable" import { BBReferenceFieldMetadata, FieldSchema, - FieldSubtype, FieldType, JsonFieldMetadata, Operation, @@ -27,6 +26,7 @@ import { INTERNAL_TABLE_SOURCE_ID, } from "@budibase/types" import environment from "../../environment" +import { helpers } from "@budibase/shared-core" type QueryFunction = (query: SqlQuery | SqlQuery[], operation: Operation) => any @@ -150,6 +150,22 @@ function getTableName(table?: Table): string | undefined { } } +function convertBooleans(query: SqlQuery | SqlQuery[]): SqlQuery | SqlQuery[] { + if (Array.isArray(query)) { + return query.map((q: SqlQuery) => convertBooleans(q) as SqlQuery) + } else { + if (query.bindings) { + query.bindings = query.bindings.map(binding => { + if (typeof binding === "boolean") { + return binding ? 1 : 0 + } + return binding + }) + } + } + return query +} + class InternalBuilder { private readonly client: string @@ -654,7 +670,11 @@ class SqlQueryBuilder extends SqlTableQueryBuilder { if (opts?.disableBindings) { return { sql: query.toString() } } else { - return getNativeSql(query) + let native = getNativeSql(query) + if (sqlClient === SqlClient.SQL_LITE) { + native = convertBooleans(native) + } + return native } } @@ -767,7 +787,7 @@ class SqlQueryBuilder extends SqlTableQueryBuilder { return ( field.type === FieldType.JSON || (field.type === FieldType.BB_REFERENCE && - field.subtype === FieldSubtype.USERS) + !helpers.schema.isDeprecatedSingleUserColumn(field)) ) } diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index 3c55d75b8b..a82a9fcea8 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -1,6 +1,5 @@ import { Knex, knex } from "knex" import { - FieldSubtype, FieldType, NumberFieldMetadata, Operation, @@ -12,7 +11,7 @@ import { TableSourceType, } from "@budibase/types" import { breakExternalTableId, getNativeSql, SqlClient } from "../utils" -import { utils } from "@budibase/shared-core" +import { helpers, utils } from "@budibase/shared-core" import SchemaBuilder = Knex.SchemaBuilder import CreateTableBuilder = Knex.CreateTableBuilder @@ -54,27 +53,15 @@ function generateSchema( ) { continue } - switch (column.type) { + const columnType = column.type + switch (columnType) { case FieldType.STRING: case FieldType.OPTIONS: case FieldType.LONGFORM: case FieldType.BARCODEQR: + case FieldType.BB_REFERENCE_SINGLE: schema.text(key) break - case FieldType.BB_REFERENCE: { - const subtype = column.subtype - switch (subtype) { - case FieldSubtype.USER: - schema.text(key) - break - case FieldSubtype.USERS: - schema.json(key) - break - default: - throw utils.unreachable(subtype) - } - break - } case FieldType.NUMBER: // if meta is specified then this is a junction table entry if (column.meta && column.meta.toKey && column.meta.toTable) { @@ -97,7 +84,13 @@ function generateSchema( }) break case FieldType.ARRAY: - schema.json(key) + case FieldType.BB_REFERENCE: + if (helpers.schema.isDeprecatedSingleUserColumn(column)) { + // This is still required for unit testing, in order to create "deprecated" schemas + schema.text(key) + } else { + schema.json(key) + } break case FieldType.LINK: // this side of the relationship doesn't need any SQL work @@ -127,6 +120,18 @@ function generateSchema( .references(`${tableName}.${relatedPrimary}`) } break + case FieldType.FORMULA: + // This is allowed, but nothing to do on the external datasource + break + case FieldType.ATTACHMENTS: + case FieldType.ATTACHMENT_SINGLE: + case FieldType.AUTO: + case FieldType.JSON: + case FieldType.INTERNAL: + throw `${column.type} is not a valid SQL type` + + default: + utils.unreachable(columnType) } } diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 7215c337d7..da98ac4875 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -17,6 +17,7 @@ import { TableRequest, TableSourceType, DatasourcePlusQueryResponse, + BBReferenceFieldSubType, } from "@budibase/types" import { OAuth2Client } from "google-auth-library" import { @@ -52,17 +53,30 @@ interface AuthTokenResponse { access_token: string } -const ALLOWED_TYPES = [ - FieldType.STRING, - FieldType.FORMULA, - FieldType.NUMBER, - FieldType.LONGFORM, - FieldType.DATETIME, - FieldType.OPTIONS, - FieldType.BOOLEAN, - FieldType.BARCODEQR, - FieldType.BB_REFERENCE, -] +const isTypeAllowed: Record = { + [FieldType.STRING]: true, + [FieldType.FORMULA]: true, + [FieldType.NUMBER]: true, + [FieldType.LONGFORM]: true, + [FieldType.DATETIME]: true, + [FieldType.OPTIONS]: true, + [FieldType.BOOLEAN]: true, + [FieldType.BARCODEQR]: true, + [FieldType.BB_REFERENCE]: true, + [FieldType.BB_REFERENCE_SINGLE]: true, + [FieldType.ARRAY]: false, + [FieldType.ATTACHMENTS]: false, + [FieldType.ATTACHMENT_SINGLE]: false, + [FieldType.LINK]: false, + [FieldType.AUTO]: false, + [FieldType.JSON]: false, + [FieldType.INTERNAL]: false, + [FieldType.BIGINT]: false, +} + +const ALLOWED_TYPES = Object.entries(isTypeAllowed) + .filter(([_, allowed]) => allowed) + .map(([type]) => type as FieldType) const SCHEMA: Integration = { plus: true, @@ -350,6 +364,7 @@ class GoogleSheetsIntegration implements DatasourcePlus { rowIndex: json.extra?.idFilter?.equal?.rowNumber, sheet, row: json.body, + table: json.meta.table, }) case Operation.DELETE: return this.delete({ @@ -371,9 +386,11 @@ class GoogleSheetsIntegration implements DatasourcePlus { } buildRowObject(headers: string[], values: string[], rowNumber: number) { - const rowObject: { rowNumber: number; [key: string]: any } = { rowNumber } + const rowObject: { rowNumber: number } & Row = { + rowNumber, + _id: rowNumber.toString(), + } for (let i = 0; i < headers.length; i++) { - rowObject._id = rowNumber rowObject[headers[i]] = values[i] } return rowObject @@ -430,14 +447,6 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - // clear out deleted columns - for (let key of sheet.headerValues) { - if (!Object.keys(table.schema).includes(key)) { - const idx = updatedHeaderValues.indexOf(key) - updatedHeaderValues.splice(idx, 1) - } - } - try { await sheet.setHeaderRow(updatedHeaderValues) } catch (err) { @@ -458,7 +467,7 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - async create(query: { sheet: string; row: any }) { + async create(query: { sheet: string; row: Row }) { try { await this.connect() const sheet = this.client.sheetsByTitle[query.sheet] @@ -474,7 +483,7 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - async createBulk(query: { sheet: string; rows: any[] }) { + async createBulk(query: { sheet: string; rows: Row[] }) { try { await this.connect() const sheet = this.client.sheetsByTitle[query.sheet] @@ -573,7 +582,12 @@ class GoogleSheetsIntegration implements DatasourcePlus { return { sheet, row } } - async update(query: { sheet: string; rowIndex: number; row: any }) { + async update(query: { + sheet: string + rowIndex: number + row: any + table: Table + }) { try { await this.connect() const { sheet, row } = await this.getRowByIndex( @@ -589,6 +603,15 @@ class GoogleSheetsIntegration implements DatasourcePlus { if (row[key] === null) { row[key] = "" } + + const { type, subtype, constraints } = query.table.schema[key] + const isDeprecatedSingleUser = + type === FieldType.BB_REFERENCE && + subtype === BBReferenceFieldSubType.USER && + constraints?.type !== "array" + if (isDeprecatedSingleUser && Array.isArray(row[key])) { + row[key] = row[key][0] + } } await row.save() return [ diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts index ffa91cdce9..f5a12c2cbf 100644 --- a/packages/server/src/integrations/rest.ts +++ b/packages/server/src/integrations/rest.ts @@ -26,13 +26,13 @@ import { parse } from "content-disposition" import path from "path" import { Builder as XmlBuilder } from "xml2js" -const BodyTypes = { - NONE: "none", - FORM_DATA: "form", - XML: "xml", - ENCODED: "encoded", - JSON: "json", - TEXT: "text", +enum BodyType { + NONE = "none", + FORM_DATA = "form", + XML = "xml", + ENCODED = "encoded", + JSON = "json", + TEXT = "text", } const coreFields = { @@ -54,7 +54,7 @@ const coreFields = { }, bodyType: { type: DatasourceFieldType.STRING, - enum: Object.values(BodyTypes), + enum: Object.values(BodyType), }, pagination: { type: DatasourceFieldType.OBJECT, @@ -131,25 +131,28 @@ class RestIntegration implements IntegrationBase { } async parseResponse(response: any, pagination: PaginationConfig | null) { - let data, raw, headers, filename + let data: any[] | string | undefined, + raw: string | undefined, + headers: Record = {}, + filename: string | undefined const contentType = response.headers.get("content-type") || "" const contentDisposition = response.headers.get("content-disposition") || "" if ( + contentDisposition.includes("filename") || contentDisposition.includes("attachment") || contentDisposition.includes("form-data") ) { filename = path.basename(parse(contentDisposition).parameters?.filename) || "" } - try { if (filename) { return handleFileResponse(response, filename, this.startTimeMs) } else { if (response.status === 204) { data = [] - raw = [] + raw = "" } else if (contentType.includes("application/json")) { data = await response.json() raw = JSON.stringify(data) @@ -162,16 +165,18 @@ class RestIntegration implements IntegrationBase { raw = xmlResponse.rawXml } else { data = await response.text() - raw = data + raw = data as string } } } catch (err) { throw `Failed to parse response body: ${err}` } - const size = formatBytes( - response.headers.get("content-length") || Buffer.byteLength(raw, "utf8") - ) + let contentLength: string = response.headers.get("content-length") + if (!contentLength && raw) { + contentLength = Buffer.byteLength(raw, "utf8").toString() + } + const size = formatBytes(contentLength || "0") const time = `${Math.round(performance.now() - this.startTimeMs)}ms` headers = response.headers.raw() for (let [key, value] of Object.entries(headers)) { @@ -255,7 +260,7 @@ class RestIntegration implements IntegrationBase { if (!input.headers) { input.headers = {} } - if (bodyType === BodyTypes.NONE) { + if (bodyType === BodyType.NONE) { return input } let error, @@ -283,11 +288,11 @@ class RestIntegration implements IntegrationBase { } switch (bodyType) { - case BodyTypes.TEXT: + case BodyType.TEXT: // content type defaults to plaintext input.body = string break - case BodyTypes.ENCODED: { + case BodyType.ENCODED: { const params = new URLSearchParams() for (let [key, value] of Object.entries(object)) { params.append(key, value as string) @@ -298,7 +303,7 @@ class RestIntegration implements IntegrationBase { input.body = params break } - case BodyTypes.FORM_DATA: { + case BodyType.FORM_DATA: { const form = new FormData() for (let [key, value] of Object.entries(object)) { form.append(key, value) @@ -309,14 +314,14 @@ class RestIntegration implements IntegrationBase { input.body = form break } - case BodyTypes.XML: + case BodyType.XML: if (object != null && Object.keys(object).length) { string = new XmlBuilder().buildObject(object) } input.body = string input.headers["Content-Type"] = "application/xml" break - case BodyTypes.JSON: + case BodyType.JSON: // if JSON error, throw it if (error) { throw "Invalid JSON for request body" diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/src/integrations/tests/aws-sdk.mock.ts similarity index 86% rename from packages/server/__mocks__/aws-sdk.ts rename to packages/server/src/integrations/tests/aws-sdk.mock.ts index d6d33f6c46..0422adfd3c 100644 --- a/packages/server/__mocks__/aws-sdk.ts +++ b/packages/server/src/integrations/tests/aws-sdk.mock.ts @@ -1,6 +1,3 @@ -import fs from "fs" -import { join } from "path" - const response = (body: any, extra?: any) => () => ({ promise: () => body, ...extra, @@ -62,9 +59,7 @@ class S3 { Body: "", }, { - createReadStream: jest - .fn() - .mockReturnValue(fs.createReadStream(join(__dirname, "aws-sdk.ts"))), + createReadStream: jest.fn().mockReturnValue("stream"), } ) ) diff --git a/packages/server/src/integrations/tests/dynamodb.spec.ts b/packages/server/src/integrations/tests/dynamodb.spec.ts index 0215817907..c992bc8bfd 100644 --- a/packages/server/src/integrations/tests/dynamodb.spec.ts +++ b/packages/server/src/integrations/tests/dynamodb.spec.ts @@ -1,7 +1,6 @@ +jest.mock("aws-sdk", () => require("./aws-sdk.mock")) import { default as DynamoDBIntegration } from "../dynamodb" -jest.mock("aws-sdk") - class TestConfiguration { integration: any diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts index c6e073d602..97ac35787d 100644 --- a/packages/server/src/integrations/tests/googlesheets.spec.ts +++ b/packages/server/src/integrations/tests/googlesheets.spec.ts @@ -129,10 +129,11 @@ describe("Google Sheets Integration", () => { }) expect(sheet.loadHeaderRow).toHaveBeenCalledTimes(1) expect(sheet.setHeaderRow).toHaveBeenCalledTimes(1) - expect(sheet.setHeaderRow).toHaveBeenCalledWith(["name"]) - - // No undefined are sent - expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(1) + expect(sheet.setHeaderRow).toHaveBeenCalledWith([ + "name", + "description", + "location", + ]) }) }) diff --git a/packages/server/src/integrations/tests/rest.spec.ts b/packages/server/src/integrations/tests/rest.spec.ts index 4b20017939..7273a2d178 100644 --- a/packages/server/src/integrations/tests/rest.spec.ts +++ b/packages/server/src/integrations/tests/rest.spec.ts @@ -28,7 +28,6 @@ jest.mock("uuid", () => ({ v4: () => "00000000-0000-0000-0000-000000000000" })) import { default as RestIntegration } from "../rest" import { RestAuthType } from "@budibase/types" import fetch from "node-fetch" -import { objectStoreTestProviders } from "@budibase/backend-core/tests" import { Readable } from "stream" const FormData = require("form-data") @@ -246,13 +245,13 @@ describe("REST Integration", () => { expect(output.extra.headers["content-type"]).toEqual("application/xml") }) - test.each(contentTypes)( + test.each([...contentTypes, undefined])( "should not throw an error on 204 no content", async contentType => { const input = buildInput(undefined, null, contentType, 204) const output = await config.integration.parseResponse(input) expect(output.data).toEqual([]) - expect(output.extra.raw).toEqual([]) + expect(output.extra.raw).toEqual("") expect(output.info.code).toEqual(204) expect(output.extra.headers["content-type"]).toEqual(contentType) } @@ -627,15 +626,6 @@ describe("REST Integration", () => { }) describe("File Handling", () => { - beforeAll(async () => { - jest.unmock("aws-sdk") - await objectStoreTestProviders.minio.start() - }) - - afterAll(async () => { - await objectStoreTestProviders.minio.stop() - }) - it("uploads file to object store and returns signed URL", async () => { const responseData = Buffer.from("teest file contnt") const filename = "test.tar.gz" diff --git a/packages/server/src/integrations/tests/s3.spec.ts b/packages/server/src/integrations/tests/s3.spec.ts index b75340ab20..abe8fb9cf1 100644 --- a/packages/server/src/integrations/tests/s3.spec.ts +++ b/packages/server/src/integrations/tests/s3.spec.ts @@ -1,7 +1,6 @@ +jest.mock("aws-sdk", () => require("./aws-sdk.mock")) import { default as S3Integration } from "../s3" -jest.mock("aws-sdk") - class TestConfiguration { integration: any diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts index 5034b5a8db..a54d0ac1a7 100644 --- a/packages/server/src/integrations/tests/utils/index.ts +++ b/packages/server/src/integrations/tests/utils/index.ts @@ -65,9 +65,7 @@ export async function rawQuery(ds: Datasource, sql: string): Promise { } export async function startContainer(container: GenericContainer) { - if (process.env.REUSE_CONTAINERS) { - container = container.withReuse() - } + container = container.withReuse().withLabels({ "com.budibase": "true" }) const startedContainer = await container.start() diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts index aac3f5f74a..892d8ae034 100644 --- a/packages/server/src/integrations/utils/utils.ts +++ b/packages/server/src/integrations/utils/utils.ts @@ -192,6 +192,11 @@ export function generateRowIdField(keyProps: any[] = []) { if (!Array.isArray(keyProps)) { keyProps = [keyProps] } + for (let index in keyProps) { + if (keyProps[index] instanceof Buffer) { + keyProps[index] = keyProps[index].toString() + } + } // this conserves order and types // we have to swap the double quotes to single quotes for use in HBS statements // when using the literal helper the double quotes can break things @@ -378,6 +383,7 @@ function copyExistingPropsOver( case FieldType.ATTACHMENT_SINGLE: case FieldType.JSON: case FieldType.BB_REFERENCE: + case FieldType.BB_REFERENCE_SINGLE: shouldKeepSchema = keepIfType(FieldType.JSON, FieldType.STRING) break diff --git a/packages/server/src/sdk/app/rows/search.ts b/packages/server/src/sdk/app/rows/search.ts index e347a8657d..2d194ab196 100644 --- a/packages/server/src/sdk/app/rows/search.ts +++ b/packages/server/src/sdk/app/rows/search.ts @@ -79,7 +79,9 @@ export async function search( } const table = await sdk.tables.getTable(options.tableId) - options = searchInputMapping(table, options) + options = searchInputMapping(table, options, { + isSql: !!table.sql || !!env.SQS_SEARCH_ENABLE, + }) if (isExternalTable) { return external.search(options, table) diff --git a/packages/server/src/sdk/app/rows/search/internalSearch.ts b/packages/server/src/sdk/app/rows/search/internalSearch.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts index 10cc5aa6c6..05b1a3bd96 100644 --- a/packages/server/src/sdk/app/rows/search/sqs.ts +++ b/packages/server/src/sdk/app/rows/search/sqs.ts @@ -131,11 +131,6 @@ export async function search( }, relationships, } - // make sure only rows returned - request.filters!.equal = { - ...request.filters?.equal, - type: "row", - } if (params.sort) { const sortField = table.schema[params.sort] @@ -169,8 +164,8 @@ export async function search( throw new Error("SQS cannot currently handle multiple queries") } - let sql = query.sql, - bindings = query.bindings + let sql = query.sql + let bindings = query.bindings // quick hack for docIds sql = sql.replace(/`doc1`.`rowId`/g, "`doc1.rowId`") diff --git a/packages/server/src/sdk/app/rows/search/tests/internal.spec.ts b/packages/server/src/sdk/app/rows/search/tests/internal.spec.ts deleted file mode 100644 index 1c5f396737..0000000000 --- a/packages/server/src/sdk/app/rows/search/tests/internal.spec.ts +++ /dev/null @@ -1,117 +0,0 @@ -import { - FieldType, - Row, - Table, - RowSearchParams, - INTERNAL_TABLE_SOURCE_ID, - TableSourceType, -} from "@budibase/types" -import TestConfiguration from "../../../../../tests/utilities/TestConfiguration" -import { search } from "../internal" -import { - expectAnyInternalColsAttributes, - generator, -} from "@budibase/backend-core/tests" - -describe("internal", () => { - const config = new TestConfiguration() - - const tableData: Table = { - name: generator.word(), - type: "table", - sourceId: INTERNAL_TABLE_SOURCE_ID, - sourceType: TableSourceType.INTERNAL, - schema: { - name: { - name: "name", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - surname: { - name: "surname", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - age: { - name: "age", - type: FieldType.NUMBER, - constraints: { - type: FieldType.NUMBER, - }, - }, - address: { - name: "address", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - }, - } - - beforeAll(async () => { - await config.init() - }) - - describe("search", () => { - const rows: Row[] = [] - beforeAll(async () => { - await config.createTable(tableData) - for (let i = 0; i < 10; i++) { - rows.push( - await config.createRow({ - name: generator.first(), - surname: generator.last(), - age: generator.age(), - address: generator.address(), - }) - ) - } - }) - - it("default search returns all the data", async () => { - await config.doInContext(config.appId, async () => { - const tableId = config.table!._id! - - const searchParams: RowSearchParams = { - tableId, - query: {}, - } - const result = await search(searchParams, config.table!) - - expect(result.rows).toHaveLength(10) - expect(result.rows).toEqual( - expect.arrayContaining(rows.map(r => expect.objectContaining(r))) - ) - }) - }) - - it("querying by fields will always return data attribute columns", async () => { - await config.doInContext(config.appId, async () => { - const tableId = config.table!._id! - - const searchParams: RowSearchParams = { - tableId, - query: {}, - fields: ["name", "age"], - } - const result = await search(searchParams, config.table!) - - expect(result.rows).toHaveLength(10) - expect(result.rows).toEqual( - expect.arrayContaining( - rows.map(r => ({ - ...expectAnyInternalColsAttributes, - name: r.name, - age: r.age, - })) - ) - ) - }) - }) - }) -}) diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts index bf7799402d..0698f727df 100644 --- a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts +++ b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts @@ -2,7 +2,7 @@ import { searchInputMapping } from "../utils" import { db as dbCore } from "@budibase/backend-core" import { FieldType, - FieldTypeSubtypes, + BBReferenceFieldSubType, INTERNAL_TABLE_SOURCE_ID, RowSearchParams, Table, @@ -19,8 +19,8 @@ const tableWithUserCol: Table = { schema: { user: { name: "user", - type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, }, }, } @@ -35,7 +35,7 @@ const tableWithUsersCol: Table = { user: { name: "user", type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USERS, + subtype: BBReferenceFieldSubType.USER, }, }, } diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts index 828925f8b6..62f5af2b70 100644 --- a/packages/server/src/sdk/app/rows/search/utils.ts +++ b/packages/server/src/sdk/app/rows/search/utils.ts @@ -3,7 +3,7 @@ import { Table, DocumentType, SEPARATOR, - FieldSubtype, + BBReferenceFieldSubType, SearchFilters, SearchIndex, SearchResponse, @@ -11,7 +11,7 @@ import { RowSearchParams, } from "@budibase/types" import { db as dbCore, context } from "@budibase/backend-core" -import { utils } from "@budibase/shared-core" +import { helpers, utils } from "@budibase/shared-core" export async function paginatedSearch( query: SearchFilters, @@ -49,13 +49,19 @@ function findColumnInQueries( } } -function userColumnMapping(column: string, options: RowSearchParams) { +function userColumnMapping( + column: string, + options: RowSearchParams, + isDeprecatedSingleUserColumn: boolean = false, + isSql: boolean = false +) { findColumnInQueries(column, options, (filterValue: any): any => { const isArray = Array.isArray(filterValue), isString = typeof filterValue === "string" if (!isString && !isArray) { return filterValue } + const processString = (input: string) => { const rowPrefix = DocumentType.ROW + SEPARATOR if (input.startsWith(rowPrefix)) { @@ -64,40 +70,60 @@ function userColumnMapping(column: string, options: RowSearchParams) { return input } } + + let wrapper = (s: string) => s + if (isDeprecatedSingleUserColumn && filterValue && isSql) { + // Decreated single users are stored as stringified arrays of a single value + wrapper = (s: string) => JSON.stringify([s]) + } + if (isArray) { return filterValue.map(el => { if (typeof el === "string") { - return processString(el) + return wrapper(processString(el)) } else { return el } }) } else { - return processString(filterValue) + return wrapper(processString(filterValue)) } }) } // maps through the search parameters to check if any of the inputs are invalid // based on the table schema, converts them to something that is valid. -export function searchInputMapping(table: Table, options: RowSearchParams) { +export function searchInputMapping( + table: Table, + options: RowSearchParams, + datasourceOptions: { isSql?: boolean } = {} +) { if (!table?.schema) { return options } for (let [key, column] of Object.entries(table.schema)) { switch (column.type) { - case FieldType.BB_REFERENCE: { + case FieldType.BB_REFERENCE_SINGLE: { const subtype = column.subtype switch (subtype) { - case FieldSubtype.USER: - case FieldSubtype.USERS: + case BBReferenceFieldSubType.USER: userColumnMapping(key, options) break + default: utils.unreachable(subtype) } break } + case FieldType.BB_REFERENCE: { + userColumnMapping( + key, + options, + helpers.schema.isDeprecatedSingleUserColumn(column), + datasourceOptions.isSql + ) + break + } } } return options diff --git a/packages/server/src/sdk/app/rows/tests/internal.spec.ts b/packages/server/src/sdk/app/rows/tests/internal.spec.ts deleted file mode 100644 index 877bd1e6dc..0000000000 --- a/packages/server/src/sdk/app/rows/tests/internal.spec.ts +++ /dev/null @@ -1,228 +0,0 @@ -import tk from "timekeeper" -import * as internalSdk from "../internal" - -import { generator } from "@budibase/backend-core/tests" -import { - INTERNAL_TABLE_SOURCE_ID, - TableSourceType, - FieldType, - Table, - AutoFieldSubType, - AutoColumnFieldMetadata, -} from "@budibase/types" - -import TestConfiguration from "../../../../tests/utilities/TestConfiguration" - -tk.freeze(Date.now()) - -describe("sdk >> rows >> internal", () => { - const config = new TestConfiguration() - - beforeAll(async () => { - await config.init() - }) - - function makeRow() { - return { - name: generator.first(), - surname: generator.last(), - age: generator.age(), - address: generator.address(), - } - } - - describe("save", () => { - const tableData: Table = { - name: generator.word(), - type: "table", - sourceId: INTERNAL_TABLE_SOURCE_ID, - sourceType: TableSourceType.INTERNAL, - schema: { - name: { - name: "name", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - surname: { - name: "surname", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - age: { - name: "age", - type: FieldType.NUMBER, - constraints: { - type: FieldType.NUMBER, - }, - }, - address: { - name: "address", - type: FieldType.STRING, - constraints: { - type: FieldType.STRING, - }, - }, - }, - } - - beforeEach(() => { - jest.clearAllMocks() - }) - - it("save will persist the row properly", async () => { - const table = await config.createTable(tableData) - const row = makeRow() - - await config.doInContext(config.appId, async () => { - const response = await internalSdk.save( - table._id!, - row, - config.getUser()._id - ) - - expect(response).toEqual({ - table, - row: { - ...row, - type: "row", - _rev: expect.stringMatching("1-.*"), - }, - squashed: { - ...row, - type: "row", - _rev: expect.stringMatching("1-.*"), - }, - }) - - const persistedRow = await config.api.row.get( - table._id!, - response.row._id! - ) - expect(persistedRow).toEqual({ - ...row, - type: "row", - _rev: expect.stringMatching("1-.*"), - createdAt: expect.any(String), - updatedAt: expect.any(String), - }) - }) - }) - - it("auto ids will update when creating new rows", async () => { - const table = await config.createTable({ - ...tableData, - schema: { - ...tableData.schema, - id: { - name: "id", - type: FieldType.AUTO, - subtype: AutoFieldSubType.AUTO_ID, - autocolumn: true, - lastID: 0, - }, - }, - }) - const row = makeRow() - - await config.doInContext(config.appId, async () => { - const response = await internalSdk.save( - table._id!, - row, - config.getUser()._id - ) - - expect(response).toEqual({ - table: { - ...table, - schema: { - ...table.schema, - id: { - ...table.schema.id, - lastID: 1, - }, - }, - }, - row: { - ...row, - id: 1, - type: "row", - _rev: expect.stringMatching("1-.*"), - }, - squashed: { - ...row, - id: 1, - type: "row", - _rev: expect.stringMatching("1-.*"), - }, - }) - - const persistedRow = await config.api.row.get( - table._id!, - response.row._id! - ) - expect(persistedRow).toEqual({ - ...row, - type: "row", - id: 1, - _rev: expect.stringMatching("1-.*"), - createdAt: expect.any(String), - updatedAt: expect.any(String), - }) - }) - }) - - it("auto ids will update when creating new rows in parallel", async () => { - function makeRows(count: number) { - return Array.from({ length: count }, () => makeRow()) - } - - const table = await config.createTable({ - ...tableData, - schema: { - ...tableData.schema, - id: { - name: "id", - type: FieldType.AUTO, - subtype: AutoFieldSubType.AUTO_ID, - autocolumn: true, - lastID: 0, - }, - }, - }) - - await config.doInContext(config.appId, async () => { - for (const row of makeRows(5)) { - await internalSdk.save(table._id!, row, config.getUser()._id) - } - await Promise.all( - makeRows(10).map(row => - internalSdk.save(table._id!, row, config.getUser()._id) - ) - ) - for (const row of makeRows(5)) { - await internalSdk.save(table._id!, row, config.getUser()._id) - } - }) - - const persistedRows = await config.getRows(table._id!) - expect(persistedRows).toHaveLength(20) - expect(persistedRows).toEqual( - expect.arrayContaining( - Array.from({ length: 20 }).map((_, i) => - expect.objectContaining({ id: i + 1 }) - ) - ) - ) - - const persistedTable = await config.getTable(table._id) - expect((table.schema.id as AutoColumnFieldMetadata).lastID).toBe(0) - expect((persistedTable.schema.id as AutoColumnFieldMetadata).lastID).toBe( - 20 - ) - }) - }) -}) diff --git a/packages/server/src/sdk/app/tables/external/index.ts b/packages/server/src/sdk/app/tables/external/index.ts index 2a78600cfc..98e6e561c8 100644 --- a/packages/server/src/sdk/app/tables/external/index.ts +++ b/packages/server/src/sdk/app/tables/external/index.ts @@ -6,6 +6,7 @@ import { Table, TableRequest, ViewV2, + AutoFieldSubType, } from "@budibase/types" import { context } from "@budibase/backend-core" import { buildExternalTableId } from "../../../../integrations/utils" @@ -29,6 +30,52 @@ import { populateExternalTableSchemas } from "../validation" import datasourceSdk from "../../datasources" import * as viewSdk from "../../views" +const DEFAULT_PRIMARY_COLUMN = "id" + +function noPrimaryKey(table: Table) { + return table.primary == null || table.primary.length === 0 +} + +function validate(table: Table, oldTable?: Table) { + if ( + !oldTable && + table.schema[DEFAULT_PRIMARY_COLUMN] && + noPrimaryKey(table) + ) { + throw new Error( + "External tables with no `primary` column set will define an `id` column, but we found an `id` column in the supplied schema. Either set a `primary` column or remove the `id` column." + ) + } + + if (hasTypeChanged(table, oldTable)) { + throw new Error("A column type has changed.") + } + + const autoSubTypes = Object.values(AutoFieldSubType) + // check for auto columns, they are not allowed + for (let [key, column] of Object.entries(table.schema)) { + // this column is a special case, do not validate it + if (key === DEFAULT_PRIMARY_COLUMN) { + continue + } + // the auto-column type should never be used + if (column.type === FieldType.AUTO) { + throw new Error( + `Column "${key}" has type "${FieldType.AUTO}" - this is not supported.` + ) + } + + if ( + column.subtype && + autoSubTypes.includes(column.subtype as AutoFieldSubType) + ) { + throw new Error( + `Column "${key}" has subtype "${column.subtype}" - this is not supported.` + ) + } + } +} + export async function save( datasourceId: string, update: Table, @@ -47,28 +94,18 @@ export async function save( oldTable = await getTable(tableId) } - if ( - !oldTable && - (tableToSave.primary == null || tableToSave.primary.length === 0) - ) { - if (tableToSave.schema.id) { - throw new Error( - "External tables with no `primary` column set will define an `id` column, but we found an `id` column in the supplied schema. Either set a `primary` column or remove the `id` column." - ) - } + // this will throw an error if something is wrong + validate(tableToSave, oldTable) - tableToSave.primary = ["id"] - tableToSave.schema.id = { + if (!oldTable && noPrimaryKey(tableToSave)) { + tableToSave.primary = [DEFAULT_PRIMARY_COLUMN] + tableToSave.schema[DEFAULT_PRIMARY_COLUMN] = { type: FieldType.NUMBER, autocolumn: true, - name: "id", + name: DEFAULT_PRIMARY_COLUMN, } } - if (hasTypeChanged(tableToSave, oldTable)) { - throw new Error("A column type has changed.") - } - for (let view in tableToSave.views) { const tableView = tableToSave.views[view] if (!tableView || !viewSdk.isV2(tableView)) continue diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts index 0726c94962..92ff309cc9 100644 --- a/packages/server/src/sdk/app/tables/internal/sqs.ts +++ b/packages/server/src/sdk/app/tables/internal/sqs.ts @@ -33,7 +33,7 @@ const FieldTypeMap: Record = { [FieldType.LONGFORM]: SQLiteType.TEXT, [FieldType.NUMBER]: SQLiteType.REAL, [FieldType.STRING]: SQLiteType.TEXT, - [FieldType.AUTO]: SQLiteType.TEXT, + [FieldType.AUTO]: SQLiteType.REAL, [FieldType.OPTIONS]: SQLiteType.TEXT, [FieldType.JSON]: SQLiteType.BLOB, [FieldType.INTERNAL]: SQLiteType.BLOB, @@ -45,6 +45,7 @@ const FieldTypeMap: Record = { [FieldType.BIGINT]: SQLiteType.TEXT, // TODO: consider the difference between multi-user and single user types (subtyping) [FieldType.BB_REFERENCE]: SQLiteType.TEXT, + [FieldType.BB_REFERENCE_SINGLE]: SQLiteType.TEXT, } function buildRelationshipDefinitions( diff --git a/packages/server/src/sdk/app/tables/migration.ts b/packages/server/src/sdk/app/tables/migration.ts index e282251bfb..d0decf01f6 100644 --- a/packages/server/src/sdk/app/tables/migration.ts +++ b/packages/server/src/sdk/app/tables/migration.ts @@ -2,9 +2,8 @@ import { BadRequestError, context, db as dbCore } from "@budibase/backend-core" import { BBReferenceFieldMetadata, FieldSchema, - FieldSubtype, + BBReferenceFieldSubType, InternalTable, - isBBReferenceField, isRelationshipField, LinkDocument, LinkInfo, @@ -12,6 +11,8 @@ import { RelationshipType, Row, Table, + FieldType, + BBReferenceSingleFieldMetadata, } from "@budibase/types" import sdk from "../../../sdk" import { isExternalTableID } from "../../../integrations/utils" @@ -24,25 +25,58 @@ export interface MigrationResult { export async function migrate( table: Table, - oldColumn: FieldSchema, - newColumn: FieldSchema + oldColumnName: string, + newColumnName: string ): Promise { - if (newColumn.name in table.schema) { - throw new BadRequestError(`Column "${newColumn.name}" already exists`) + if (newColumnName in table.schema) { + throw new BadRequestError(`Column "${newColumnName}" already exists`) } - if (newColumn.name === "") { + if (newColumnName === "") { throw new BadRequestError(`Column name cannot be empty`) } - if (dbCore.isInternalColumnName(newColumn.name)) { + if (dbCore.isInternalColumnName(newColumnName)) { throw new BadRequestError(`Column name cannot be a reserved column name`) } + const oldColumn = table.schema[oldColumnName] + + if (!oldColumn) { + throw new BadRequestError( + `Column "${oldColumnName}" does not exist on table "${table.name}"` + ) + } + + if ( + oldColumn.type !== FieldType.LINK || + oldColumn.tableId !== InternalTable.USER_METADATA + ) { + throw new BadRequestError( + `Only user relationship migration columns is currently supported` + ) + } + + const type = + oldColumn.relationshipType === RelationshipType.ONE_TO_MANY + ? FieldType.BB_REFERENCE_SINGLE + : FieldType.BB_REFERENCE + const newColumn: FieldSchema = { + name: newColumnName, + type, + subtype: BBReferenceFieldSubType.USER, + } + + if (newColumn.type === FieldType.BB_REFERENCE) { + newColumn.constraints = { + type: "array", + } + } + table.schema[newColumn.name] = newColumn table = await sdk.tables.saveTable(table) - let migrator = getColumnMigrator(table, oldColumn, newColumn) + const migrator = getColumnMigrator(table, oldColumn, newColumn) try { return await migrator.doMigration() } catch (e) { @@ -75,11 +109,14 @@ function getColumnMigrator( throw new BadRequestError(`Column "${oldColumn.name}" does not exist`) } - if (!isBBReferenceField(newColumn)) { + if ( + newColumn.type !== FieldType.BB_REFERENCE_SINGLE && + newColumn.type !== FieldType.BB_REFERENCE + ) { throw new BadRequestError(`Column "${newColumn.name}" is not a user column`) } - if (newColumn.subtype !== "user" && newColumn.subtype !== "users") { + if (newColumn.subtype !== BBReferenceFieldSubType.USER) { throw new BadRequestError(`Column "${newColumn.name}" is not a user column`) } @@ -96,7 +133,7 @@ function getColumnMigrator( } if (oldColumn.relationshipType === RelationshipType.ONE_TO_MANY) { - if (newColumn.subtype !== FieldSubtype.USER) { + if (newColumn.type !== FieldType.BB_REFERENCE_SINGLE) { throw new BadRequestError( `Column "${oldColumn.name}" is a one-to-many column but "${newColumn.name}" is not a single user column` ) @@ -107,22 +144,23 @@ function getColumnMigrator( oldColumn.relationshipType === RelationshipType.MANY_TO_MANY || oldColumn.relationshipType === RelationshipType.MANY_TO_ONE ) { - if (newColumn.subtype !== FieldSubtype.USERS) { + if (newColumn.type !== FieldType.BB_REFERENCE) { throw new BadRequestError( `Column "${oldColumn.name}" is a ${oldColumn.relationshipType} column but "${newColumn.name}" is not a multi user column` ) } + return new MultiUserColumnMigrator(table, oldColumn, newColumn) } throw new BadRequestError(`Unknown migration type`) } -abstract class UserColumnMigrator implements ColumnMigrator { +abstract class UserColumnMigrator implements ColumnMigrator { constructor( protected table: Table, protected oldColumn: RelationshipFieldMetadata, - protected newColumn: BBReferenceFieldMetadata + protected newColumn: T ) {} abstract updateRow(row: Row, linkInfo: LinkInfo): void @@ -192,7 +230,7 @@ abstract class UserColumnMigrator implements ColumnMigrator { } } -class SingleUserColumnMigrator extends UserColumnMigrator { +class SingleUserColumnMigrator extends UserColumnMigrator { updateRow(row: Row, linkInfo: LinkInfo): void { row[this.newColumn.name] = dbCore.getGlobalIDFromUserMetadataID( linkInfo.rowId @@ -200,7 +238,7 @@ class SingleUserColumnMigrator extends UserColumnMigrator { } } -class MultiUserColumnMigrator extends UserColumnMigrator { +class MultiUserColumnMigrator extends UserColumnMigrator { updateRow(row: Row, linkInfo: LinkInfo): void { if (!row[this.newColumn.name]) { row[this.newColumn.name] = [] diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts index 9632ac29d8..0194e900fe 100644 --- a/packages/server/src/sdk/users/utils.ts +++ b/packages/server/src/sdk/users/utils.ts @@ -124,3 +124,12 @@ export async function syncGlobalUsers() { await db.bulkDocs(toWrite) } } + +export function getUserContextBindings(user: ContextUser) { + if (!user) { + return {} + } + // Current user context for bindable search + const { _id, _rev, firstName, lastName, email, status, roleId } = user + return { _id, _rev, firstName, lastName, email, status, roleId } +} diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts index 3b0c2a88d9..a44ce58f81 100644 --- a/packages/server/src/tests/jestEnv.ts +++ b/packages/server/src/tests/jestEnv.ts @@ -14,3 +14,6 @@ process.env.WORKER_URL = "http://localhost:10000" process.env.COUCH_DB_PASSWORD = "budibase" process.env.COUCH_DB_USER = "budibase" process.env.JWT_SECRET = "jwtsecret" +process.env.MINIO_URL = "http://localhost" +process.env.MINIO_ACCESS_KEY = "budibase" +process.env.MINIO_SECRET_KEY = "budibase" diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 42f173a1f0..58dbecd197 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -81,6 +81,12 @@ mocks.licenses.useUnlimited() dbInit() +export interface CreateAppRequest { + appName: string + url?: string + snippets?: any[] +} + export interface TableToBuild extends Omit { sourceId?: string sourceType?: TableSourceType @@ -580,8 +586,6 @@ export default class TestConfiguration { // APP async createApp(appName: string, url?: string): Promise { - // create dev app - // clear any old app this.appId = undefined this.app = await context.doInTenant( this.tenantId!, @@ -592,6 +596,7 @@ export default class TestConfiguration { })) as App ) this.appId = this.app.appId + return await context.doInAppContext(this.app.appId!, async () => { // create production app this.prodApp = await this.publish() diff --git a/packages/server/src/tests/utilities/api/application.ts b/packages/server/src/tests/utilities/api/application.ts index d28df223b5..bb9357c893 100644 --- a/packages/server/src/tests/utilities/api/application.ts +++ b/packages/server/src/tests/utilities/api/application.ts @@ -5,6 +5,8 @@ import { type FetchAppDefinitionResponse, type FetchAppPackageResponse, DuplicateAppResponse, + UpdateAppRequest, + UpdateAppResponse, } from "@budibase/types" import { Expectations, TestAPI } from "./base" import { AppStatus } from "../../../db/utils" @@ -109,11 +111,11 @@ export class ApplicationAPI extends TestAPI { update = async ( appId: string, - app: { name?: string; url?: string }, + app: UpdateAppRequest, expectations?: Expectations - ): Promise => { + ): Promise => { return await this._put(`/api/applications/${appId}`, { - fields: app, + body: app, expectations, }) } diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts index 2a32489c30..77a6431335 100644 --- a/packages/server/src/tests/utilities/structures.ts +++ b/packages/server/src/tests/utilities/structures.ts @@ -78,6 +78,32 @@ export function basicTable( ) } +export function basicTableWithAttachmentField( + datasource?: Datasource, + ...extra: Partial[] +): Table { + return tableForDatasource( + datasource, + { + name: "TestTable", + schema: { + file_attachment: { + type: FieldType.ATTACHMENTS, + name: "description", + constraints: { + type: "array", + }, + }, + single_file_attachment: { + type: FieldType.ATTACHMENT_SINGLE, + name: "description", + }, + }, + }, + ...extra + ) +} + export function basicView(tableId: string) { return { tableId, diff --git a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts index a5fbfa981d..d69fe73052 100644 --- a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts +++ b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts @@ -1,30 +1,65 @@ import { cache, db as dbCore } from "@budibase/backend-core" import { utils } from "@budibase/shared-core" -import { FieldSubtype, DocumentType, SEPARATOR } from "@budibase/types" +import { + BBReferenceFieldSubType, + DocumentType, + SEPARATOR, +} from "@budibase/types" import { InvalidBBRefError } from "./errors" const ROW_PREFIX = DocumentType.ROW + SEPARATOR -export async function processInputBBReferences( - value: string | string[] | { _id: string } | { _id: string }[], - subtype: FieldSubtype.USER | FieldSubtype.USERS -): Promise { - let referenceIds: string[] = [] +export async function processInputBBReference( + value: string | { _id: string }, + subtype: BBReferenceFieldSubType.USER +): Promise { + if (value && Array.isArray(value)) { + throw "BB_REFERENCE_SINGLE cannot be an array" + } + let id = typeof value === "string" ? value : value?._id - if (Array.isArray(value)) { - referenceIds.push( - ...value.map(idOrDoc => - typeof idOrDoc === "string" ? idOrDoc : idOrDoc._id - ) - ) - } else if (typeof value !== "string") { - referenceIds.push(value._id) + if (!id) { + return null + } + + switch (subtype) { + case BBReferenceFieldSubType.USER: { + if (id.startsWith(ROW_PREFIX)) { + id = dbCore.getGlobalIDFromUserMetadataID(id) + } + + try { + await cache.user.getUser(id) + return id + } catch (e: any) { + if (e.statusCode === 404) { + throw new InvalidBBRefError(id, BBReferenceFieldSubType.USER) + } + throw e + } + } + + default: + throw utils.unreachable(subtype) + } +} +export async function processInputBBReferences( + value: string | string[] | { _id: string }[], + subtype: BBReferenceFieldSubType +): Promise { + if (!value || !value[0]) { + return null + } + + let referenceIds + if (typeof value === "string") { + referenceIds = value + .split(",") + .map(u => u.trim()) + .filter(u => !!u) } else { - referenceIds.push( - ...value - .split(",") - .filter(x => x) - .map((id: string) => id.trim()) + referenceIds = value.map(idOrDoc => + typeof idOrDoc === "string" ? idOrDoc : idOrDoc._id ) } @@ -40,19 +75,67 @@ export async function processInputBBReferences( }) switch (subtype) { - case FieldSubtype.USER: - case FieldSubtype.USERS: { + case undefined: + throw "Subtype must be defined" + case BBReferenceFieldSubType.USER: + case BBReferenceFieldSubType.USERS: { const { notFoundIds } = await cache.user.getUsers(referenceIds) if (notFoundIds?.length) { - throw new InvalidBBRefError(notFoundIds[0], FieldSubtype.USER) + throw new InvalidBBRefError( + notFoundIds[0], + BBReferenceFieldSubType.USER + ) } - if (subtype === FieldSubtype.USERS) { - return referenceIds + if (!referenceIds?.length) { + return null } - return referenceIds.join(",") || null + return referenceIds + } + default: + throw utils.unreachable(subtype) + } +} + +interface UserReferenceInfo { + _id: string + primaryDisplay: string + email: string + firstName?: string + lastName?: string +} + +export async function processOutputBBReference( + value: string | null | undefined, + subtype: BBReferenceFieldSubType.USER +): Promise { + if (!value) { + return undefined + } + + switch (subtype) { + case BBReferenceFieldSubType.USER: { + let user + try { + user = await cache.user.getUser(value as string) + } catch (err: any) { + if (err.statusCode !== 404) { + throw err + } + } + if (!user) { + return undefined + } + + return { + _id: user._id!, + primaryDisplay: user.email, + email: user.email, + firstName: user.firstName, + lastName: user.lastName, + } } default: throw utils.unreachable(subtype) @@ -60,27 +143,25 @@ export async function processInputBBReferences( } export async function processOutputBBReferences( - value: string | string[], - subtype: FieldSubtype.USER | FieldSubtype.USERS -) { - if (value === null || value === undefined) { - // Already processed or nothing to process - return value || undefined + value: string | null | undefined, + subtype: BBReferenceFieldSubType +): Promise { + if (!value) { + return undefined } - const ids = typeof value === "string" ? value.split(",").filter(id => !!id) : value switch (subtype) { - case FieldSubtype.USER: - case FieldSubtype.USERS: { + case BBReferenceFieldSubType.USER: + case BBReferenceFieldSubType.USERS: { const { users } = await cache.user.getUsers(ids) if (!users.length) { return undefined } return users.map(u => ({ - _id: u._id, + _id: u._id!, primaryDisplay: u.email, email: u.email, firstName: u.firstName, diff --git a/packages/server/src/utilities/rowProcessor/errors.ts b/packages/server/src/utilities/rowProcessor/errors.ts index 279a528b5f..12b32d098a 100644 --- a/packages/server/src/utilities/rowProcessor/errors.ts +++ b/packages/server/src/utilities/rowProcessor/errors.ts @@ -1,7 +1,7 @@ -import { FieldSubtype } from "@budibase/types" +import { BBReferenceFieldSubType } from "@budibase/types" export class InvalidBBRefError extends Error { - constructor(id: string, subtype: FieldSubtype) { + constructor(id: string, subtype: BBReferenceFieldSubType) { super(`Id "${id}" is not valid for the subtype "${subtype}"`) } } diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts index e69cfa471a..b71f40e870 100644 --- a/packages/server/src/utilities/rowProcessor/index.ts +++ b/packages/server/src/utilities/rowProcessor/index.ts @@ -12,7 +12,9 @@ import { } from "@budibase/types" import { cloneDeep } from "lodash/fp" import { + processInputBBReference, processInputBBReferences, + processOutputBBReference, processOutputBBReferences, } from "./bbReferenceProcessor" import { isExternalTableID } from "../../integrations/utils" @@ -25,8 +27,6 @@ type AutoColumnProcessingOpts = { noAutoRelationships?: boolean } -const BASE_AUTO_ID = 1 - /** * This will update any auto columns that are found on the row/table with the correct information based on * time now and the current logged in user making the request. @@ -37,7 +37,7 @@ const BASE_AUTO_ID = 1 * @returns The updated row and table, the table may need to be updated * for automatic ID purposes. */ -export function processAutoColumn( +export async function processAutoColumn( userId: string | null | undefined, table: Table, row: Row, @@ -79,8 +79,10 @@ export function processAutoColumn( break case AutoFieldSubType.AUTO_ID: if (creating) { - schema.lastID = !schema.lastID ? BASE_AUTO_ID : schema.lastID + 1 - row[key] = schema.lastID + schema.lastID = schema.lastID || 0 + row[key] = schema.lastID + 1 + schema.lastID++ + table.schema[key] = schema } break } @@ -160,10 +162,10 @@ export async function inputProcessing( if (attachment?.url) { delete clonedRow[key].url } - } - - if (field.type === FieldType.BB_REFERENCE && value) { + } else if (field.type === FieldType.BB_REFERENCE && value) { clonedRow[key] = await processInputBBReferences(value, field.subtype) + } else if (field.type === FieldType.BB_REFERENCE_SINGLE && value) { + clonedRow[key] = await processInputBBReference(value, field.subtype) } } @@ -234,7 +236,7 @@ export async function outputProcessing( } } else if (column.type === FieldType.ATTACHMENT_SINGLE) { for (let row of enriched) { - if (!row[property]) { + if (!row[property] || Object.keys(row[property]).length === 0) { continue } @@ -252,6 +254,16 @@ export async function outputProcessing( column.subtype ) } + } else if ( + !opts.skipBBReferences && + column.type == FieldType.BB_REFERENCE_SINGLE + ) { + for (let row of enriched) { + row[property] = await processOutputBBReference( + row[property], + column.subtype + ) + } } } diff --git a/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts b/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts index e6ceaae323..c5a7b7fc84 100644 --- a/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts @@ -1,8 +1,10 @@ import _ from "lodash" import * as backendCore from "@budibase/backend-core" -import { FieldSubtype, User } from "@budibase/types" +import { BBReferenceFieldSubType, User } from "@budibase/types" import { + processInputBBReference, processInputBBReferences, + processOutputBBReference, processOutputBBReferences, } from "../bbReferenceProcessor" import { @@ -22,6 +24,7 @@ jest.mock("@budibase/backend-core", (): typeof backendCore => { ...actual.cache, user: { ...actual.cache.user, + getUser: jest.fn(actual.cache.user.getUser), getUsers: jest.fn(actual.cache.user.getUsers), }, }, @@ -31,6 +34,9 @@ jest.mock("@budibase/backend-core", (): typeof backendCore => { const config = new DBTestConfiguration() describe("bbReferenceProcessor", () => { + const cacheGetUserSpy = backendCore.cache.user.getUser as jest.MockedFunction< + typeof backendCore.cache.user.getUser + > const cacheGetUsersSpy = backendCore.cache.user .getUsers as jest.MockedFunction @@ -56,6 +62,64 @@ describe("bbReferenceProcessor", () => { jest.clearAllMocks() }) + describe("processInputBBReference", () => { + describe("subtype user", () => { + it("validate valid string id", async () => { + const user = _.sample(users) + const userId = user!._id! + + const result = await config.doInTenant(() => + processInputBBReference(userId, BBReferenceFieldSubType.USER) + ) + + expect(result).toEqual(userId) + expect(cacheGetUserSpy).toHaveBeenCalledTimes(1) + expect(cacheGetUserSpy).toHaveBeenCalledWith(userId) + }) + + it("throws an error given an invalid id", async () => { + const userId = generator.guid() + + await expect( + config.doInTenant(() => + processInputBBReference(userId, BBReferenceFieldSubType.USER) + ) + ).rejects.toThrow( + new InvalidBBRefError(userId, BBReferenceFieldSubType.USER) + ) + }) + + it("validate valid user object", async () => { + const userId = _.sample(users)!._id! + + const result = await config.doInTenant(() => + processInputBBReference({ _id: userId }, BBReferenceFieldSubType.USER) + ) + + expect(result).toEqual(userId) + expect(cacheGetUserSpy).toHaveBeenCalledTimes(1) + expect(cacheGetUserSpy).toHaveBeenCalledWith(userId) + }) + + it("empty strings will return null", async () => { + const result = await config.doInTenant(() => + processInputBBReference("", BBReferenceFieldSubType.USER) + ) + + expect(result).toEqual(null) + }) + + it("should convert user medata IDs to global IDs", async () => { + const userId = _.sample(users)!._id! + const userMetadataId = backendCore.db.generateUserMetadataID(userId) + const result = await config.doInTenant(() => + processInputBBReference(userMetadataId, BBReferenceFieldSubType.USER) + ) + expect(result).toBe(userId) + }) + }) + }) + describe("processInputBBReferences", () => { describe("subtype user", () => { it("validate valid string id", async () => { @@ -63,10 +127,10 @@ describe("bbReferenceProcessor", () => { const userId = user!._id! const result = await config.doInTenant(() => - processInputBBReferences(userId, FieldSubtype.USER) + processInputBBReferences(userId, BBReferenceFieldSubType.USER) ) - expect(result).toEqual(userId) + expect(result).toEqual([userId]) expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) expect(cacheGetUsersSpy).toHaveBeenCalledWith([userId]) }) @@ -76,9 +140,11 @@ describe("bbReferenceProcessor", () => { await expect( config.doInTenant(() => - processInputBBReferences(userId, FieldSubtype.USER) + processInputBBReferences(userId, BBReferenceFieldSubType.USER) ) - ).rejects.toThrow(new InvalidBBRefError(userId, FieldSubtype.USER)) + ).rejects.toThrow( + new InvalidBBRefError(userId, BBReferenceFieldSubType.USER) + ) expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) expect(cacheGetUsersSpy).toHaveBeenCalledWith([userId]) }) @@ -88,10 +154,10 @@ describe("bbReferenceProcessor", () => { const userIdCsv = userIds.join(" , ") const result = await config.doInTenant(() => - processInputBBReferences(userIdCsv, FieldSubtype.USER) + processInputBBReferences(userIdCsv, BBReferenceFieldSubType.USER) ) - expect(result).toEqual(userIds.join(",")) + expect(result).toEqual(userIds) expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) expect(cacheGetUsersSpy).toHaveBeenCalledWith(userIds) }) @@ -108,38 +174,33 @@ describe("bbReferenceProcessor", () => { await expect( config.doInTenant(() => - processInputBBReferences(userIdCsv, FieldSubtype.USER) + processInputBBReferences(userIdCsv, BBReferenceFieldSubType.USER) ) - ).rejects.toThrow(new InvalidBBRefError(wrongId, FieldSubtype.USER)) - }) - - it("validate valid user object", async () => { - const userId = _.sample(users)!._id! - - const result = await config.doInTenant(() => - processInputBBReferences({ _id: userId }, FieldSubtype.USER) + ).rejects.toThrow( + new InvalidBBRefError(wrongId, BBReferenceFieldSubType.USER) ) - - expect(result).toEqual(userId) - expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) - expect(cacheGetUsersSpy).toHaveBeenCalledWith([userId]) }) it("validate valid user object array", async () => { - const userIds = _.sampleSize(users, 3).map(x => x._id!) + const inputUsers = _.sampleSize(users, 3).map(u => ({ _id: u._id! })) + const userIds = inputUsers.map(u => u._id) const result = await config.doInTenant(() => - processInputBBReferences(userIds, FieldSubtype.USER) + processInputBBReferences(inputUsers, BBReferenceFieldSubType.USER) ) - expect(result).toEqual(userIds.join(",")) + expect(result).toEqual(userIds) expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) expect(cacheGetUsersSpy).toHaveBeenCalledWith(userIds) }) it("empty strings will return null", async () => { const result = await config.doInTenant(() => - processInputBBReferences("", FieldSubtype.USER) + processInputBBReferences( + "", + + BBReferenceFieldSubType.USER + ) ) expect(result).toEqual(null) @@ -147,7 +208,7 @@ describe("bbReferenceProcessor", () => { it("empty arrays will return null", async () => { const result = await config.doInTenant(() => - processInputBBReferences([], FieldSubtype.USER) + processInputBBReferences([], BBReferenceFieldSubType.USER) ) expect(result).toEqual(null) @@ -157,9 +218,44 @@ describe("bbReferenceProcessor", () => { const userId = _.sample(users)!._id! const userMetadataId = backendCore.db.generateUserMetadataID(userId) const result = await config.doInTenant(() => - processInputBBReferences(userMetadataId, FieldSubtype.USER) + processInputBBReferences(userMetadataId, BBReferenceFieldSubType.USER) ) - expect(result).toBe(userId) + expect(result).toEqual([userId]) + }) + }) + }) + + describe("processOutputBBReference", () => { + describe("subtype user", () => { + it("fetches user given a valid string id", async () => { + const user = _.sample(users)! + const userId = user._id! + + const result = await config.doInTenant(() => + processOutputBBReference(userId, BBReferenceFieldSubType.USER) + ) + + expect(result).toEqual({ + _id: user._id, + primaryDisplay: user.email, + email: user.email, + firstName: user.firstName, + lastName: user.lastName, + }) + expect(cacheGetUserSpy).toHaveBeenCalledTimes(1) + expect(cacheGetUserSpy).toHaveBeenCalledWith(userId) + }) + + it("returns undefined given an unexisting user", async () => { + const userId = generator.guid() + + const result = await config.doInTenant(() => + processOutputBBReference(userId, BBReferenceFieldSubType.USER) + ) + + expect(result).toBeUndefined() + expect(cacheGetUserSpy).toHaveBeenCalledTimes(1) + expect(cacheGetUserSpy).toHaveBeenCalledWith(userId) }) }) }) @@ -171,7 +267,7 @@ describe("bbReferenceProcessor", () => { const userId = user._id! const result = await config.doInTenant(() => - processOutputBBReferences(userId, FieldSubtype.USER) + processOutputBBReferences(userId, BBReferenceFieldSubType.USER) ) expect(result).toEqual([ @@ -195,7 +291,7 @@ describe("bbReferenceProcessor", () => { const result = await config.doInTenant(() => processOutputBBReferences( [userId1, userId2].join(","), - FieldSubtype.USER + BBReferenceFieldSubType.USER ) ) @@ -214,6 +310,46 @@ describe("bbReferenceProcessor", () => { expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) expect(cacheGetUsersSpy).toHaveBeenCalledWith([userId1, userId2]) }) + + it("trims unexisting users user given a valid string id csv", async () => { + const [user1, user2] = _.sampleSize(users, 2) + const userId1 = user1._id! + const userId2 = user2._id! + + const unexistingUserId1 = generator.guid() + const unexistingUserId2 = generator.guid() + + const input = [ + unexistingUserId1, + userId1, + unexistingUserId2, + userId2, + ].join(",") + + const result = await config.doInTenant(() => + processOutputBBReferences(input, BBReferenceFieldSubType.USER) + ) + + expect(result).toHaveLength(2) + expect(result).toEqual( + expect.arrayContaining( + [user1, user2].map(u => ({ + _id: u._id, + primaryDisplay: u.email, + email: u.email, + firstName: u.firstName, + lastName: u.lastName, + })) + ) + ) + expect(cacheGetUsersSpy).toHaveBeenCalledTimes(1) + expect(cacheGetUsersSpy).toHaveBeenCalledWith([ + unexistingUserId1, + userId1, + unexistingUserId2, + userId2, + ]) + }) }) }) }) diff --git a/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts b/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts index 859a203133..b1928b696b 100644 --- a/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts @@ -2,7 +2,7 @@ import { inputProcessing } from ".." import { generator, structures } from "@budibase/backend-core/tests" import { FieldType, - FieldTypeSubtypes, + BBReferenceFieldSubType, INTERNAL_TABLE_SOURCE_ID, Table, TableSourceType, @@ -10,7 +10,9 @@ import { import * as bbReferenceProcessor from "../bbReferenceProcessor" jest.mock("../bbReferenceProcessor", (): typeof bbReferenceProcessor => ({ + processInputBBReference: jest.fn(), processInputBBReferences: jest.fn(), + processOutputBBReference: jest.fn(), processOutputBBReferences: jest.fn(), })) @@ -19,7 +21,64 @@ describe("rowProcessor - inputProcessing", () => { jest.resetAllMocks() }) - it("processes BB references if on the schema and it's populated", async () => { + const processInputBBReferenceMock = + bbReferenceProcessor.processInputBBReference as jest.Mock + const processInputBBReferencesMock = + bbReferenceProcessor.processInputBBReferences as jest.Mock + + it("processes single BB references if on the schema and it's populated", async () => { + const userId = generator.guid() + + const table: Table = { + _id: generator.guid(), + name: "TestTable", + type: "table", + sourceId: INTERNAL_TABLE_SOURCE_ID, + sourceType: TableSourceType.INTERNAL, + schema: { + name: { + type: FieldType.STRING, + name: "name", + constraints: { + presence: true, + type: "string", + }, + }, + user: { + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, + name: "user", + constraints: { + presence: true, + type: "string", + }, + }, + }, + } + + const newRow = { + name: "Jack", + user: "123", + } + + const user = structures.users.user() + + processInputBBReferenceMock.mockResolvedValue(user) + + const { row } = await inputProcessing(userId, table, newRow) + + expect(bbReferenceProcessor.processInputBBReference).toHaveBeenCalledTimes( + 1 + ) + expect(bbReferenceProcessor.processInputBBReference).toHaveBeenCalledWith( + "123", + "user" + ) + + expect(row).toEqual({ ...newRow, user }) + }) + + it("processes multiple BB references if on the schema and it's populated", async () => { const userId = generator.guid() const table: Table = { @@ -39,7 +98,7 @@ describe("rowProcessor - inputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: BBReferenceFieldSubType.USER, name: "user", constraints: { presence: true, @@ -56,9 +115,7 @@ describe("rowProcessor - inputProcessing", () => { const user = structures.users.user() - ;( - bbReferenceProcessor.processInputBBReferences as jest.Mock - ).mockResolvedValue(user) + processInputBBReferencesMock.mockResolvedValue(user) const { row } = await inputProcessing(userId, table, newRow) @@ -93,7 +150,7 @@ describe("rowProcessor - inputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: BBReferenceFieldSubType.USER, name: "user", constraints: { presence: false, @@ -135,7 +192,7 @@ describe("rowProcessor - inputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: BBReferenceFieldSubType.USER, name: "user", constraints: { presence: false, diff --git a/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts b/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts index 74d55aff36..fd48f46016 100644 --- a/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts @@ -1,7 +1,6 @@ import { - FieldSubtype, FieldType, - FieldTypeSubtypes, + BBReferenceFieldSubType, INTERNAL_TABLE_SOURCE_ID, RowAttachment, Table, @@ -12,7 +11,9 @@ import { generator, structures } from "@budibase/backend-core/tests" import * as bbReferenceProcessor from "../bbReferenceProcessor" jest.mock("../bbReferenceProcessor", (): typeof bbReferenceProcessor => ({ + processInputBBReference: jest.fn(), processInputBBReferences: jest.fn(), + processOutputBBReference: jest.fn(), processOutputBBReferences: jest.fn(), })) @@ -21,10 +22,12 @@ describe("rowProcessor - outputProcessing", () => { jest.resetAllMocks() }) + const processOutputBBReferenceMock = + bbReferenceProcessor.processOutputBBReference as jest.Mock const processOutputBBReferencesMock = bbReferenceProcessor.processOutputBBReferences as jest.Mock - it("fetches bb user references given a populated field", async () => { + it("fetches single user references given a populated field", async () => { const table: Table = { _id: generator.guid(), name: "TestTable", @@ -41,8 +44,8 @@ describe("rowProcessor - outputProcessing", () => { }, }, user: { - type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + type: FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType.USER, name: "user", constraints: { presence: false, @@ -58,18 +61,67 @@ describe("rowProcessor - outputProcessing", () => { } const user = structures.users.user() - processOutputBBReferencesMock.mockResolvedValue(user) + processOutputBBReferenceMock.mockResolvedValue(user) const result = await outputProcessing(table, row, { squash: false }) expect(result).toEqual({ name: "Jack", user }) + expect(bbReferenceProcessor.processOutputBBReference).toHaveBeenCalledTimes( + 1 + ) + expect(bbReferenceProcessor.processOutputBBReference).toHaveBeenCalledWith( + "123", + BBReferenceFieldSubType.USER + ) + }) + + it("fetches users references given a populated field", async () => { + const table: Table = { + _id: generator.guid(), + name: "TestTable", + type: "table", + sourceId: INTERNAL_TABLE_SOURCE_ID, + sourceType: TableSourceType.INTERNAL, + schema: { + name: { + type: FieldType.STRING, + name: "name", + constraints: { + presence: true, + type: "string", + }, + }, + users: { + type: FieldType.BB_REFERENCE, + subtype: BBReferenceFieldSubType.USER, + name: "users", + constraints: { + presence: false, + type: "string", + }, + }, + }, + } + + const row = { + name: "Jack", + users: "123", + } + + const users = [structures.users.user()] + processOutputBBReferencesMock.mockResolvedValue(users) + + const result = await outputProcessing(table, row, { squash: false }) + + expect(result).toEqual({ name: "Jack", users }) + expect( bbReferenceProcessor.processOutputBBReferences ).toHaveBeenCalledTimes(1) expect(bbReferenceProcessor.processOutputBBReferences).toHaveBeenCalledWith( "123", - FieldSubtype.USER + BBReferenceFieldSubType.USER ) }) @@ -101,13 +153,13 @@ describe("rowProcessor - outputProcessing", () => { } const output = await outputProcessing(table, row, { squash: false }) - expect(output.attach[0].url).toBe( + expect(output.attach[0].url?.split("?")[0]).toBe( "/files/signed/prod-budi-app-assets/test.jpg" ) row.attach[0].url = "" const output2 = await outputProcessing(table, row, { squash: false }) - expect(output2.attach[0].url).toBe( + expect(output2.attach[0].url?.split("?")[0]).toBe( "/files/signed/prod-budi-app-assets/test.jpg" ) @@ -142,13 +194,13 @@ describe("rowProcessor - outputProcessing", () => { } const output = await outputProcessing(table, row, { squash: false }) - expect(output.attach.url).toBe( + expect(output.attach.url?.split("?")[0]).toBe( "/files/signed/prod-budi-app-assets/test.jpg" ) row.attach.url = "" const output2 = await outputProcessing(table, row, { squash: false }) - expect(output2.attach.url).toBe( + expect(output2.attach?.url?.split("?")[0]).toBe( "/files/signed/prod-budi-app-assets/test.jpg" ) @@ -175,7 +227,7 @@ describe("rowProcessor - outputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: BBReferenceFieldSubType.USER, name: "user", constraints: { presence: false, diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index 4c7f0b7423..4f0feb3c93 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -1,6 +1,6 @@ import { FieldType, - FieldSubtype, + BBReferenceFieldSubType, TableSchema, FieldSchema, Row, @@ -54,6 +54,7 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults { type: columnType, subtype: columnSubtype, autocolumn: isAutoColumn, + constraints, } = schema[columnName] || {} // If the column had an invalid value we don't want to override it @@ -61,6 +62,12 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults { return } + const isRequired = + !!constraints && + ((typeof constraints.presence !== "boolean" && + !constraints.presence?.allowEmpty) || + constraints.presence === true) + // If the columnType is not a string, then it's not present in the schema, and should be added to the invalid columns array if (typeof columnType !== "string") { results.invalidColumns.push(columnName) @@ -92,8 +99,9 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults { ) { results.schemaValidation[columnName] = false } else if ( - columnType === FieldType.BB_REFERENCE && - !isValidBBReference(columnData, columnSubtype) + (columnType === FieldType.BB_REFERENCE || + columnType === FieldType.BB_REFERENCE_SINGLE) && + !isValidBBReference(columnData, columnType, columnSubtype, isRequired) ) { results.schemaValidation[columnName] = false } else { @@ -121,7 +129,7 @@ export function parse(rows: Rows, schema: TableSchema): Rows { return } - const { type: columnType, subtype: columnSubtype } = schema[columnName] + const { type: columnType } = schema[columnName] if (columnType === FieldType.NUMBER) { // If provided must be a valid number parsedRow[columnName] = columnData ? Number(columnData) : columnData @@ -131,22 +139,16 @@ export function parse(rows: Rows, schema: TableSchema): Rows { ? new Date(columnData).toISOString() : columnData } else if (columnType === FieldType.BB_REFERENCE) { - const parsedValues = - !!columnData && parseCsvExport<{ _id: string }[]>(columnData) - if (!parsedValues) { - parsedRow[columnName] = undefined - } else { - switch (columnSubtype) { - case FieldSubtype.USER: - parsedRow[columnName] = parsedValues[0]?._id - break - case FieldSubtype.USERS: - parsedRow[columnName] = parsedValues.map(u => u._id) - break - default: - utils.unreachable(columnSubtype) - } + let parsedValues: { _id: string }[] = columnData || [] + if (columnData) { + parsedValues = parseCsvExport<{ _id: string }[]>(columnData) } + + parsedRow[columnName] = parsedValues?.map(u => u._id) + } else if (columnType === FieldType.BB_REFERENCE_SINGLE) { + const parsedValue = + columnData && parseCsvExport<{ _id: string }>(columnData) + parsedRow[columnName] = parsedValue?._id } else if ( (columnType === FieldType.ATTACHMENTS || columnType === FieldType.ATTACHMENT_SINGLE) && @@ -163,21 +165,28 @@ export function parse(rows: Rows, schema: TableSchema): Rows { } function isValidBBReference( - columnData: any, - columnSubtype: FieldSubtype.USER | FieldSubtype.USERS + data: any, + type: FieldType.BB_REFERENCE | FieldType.BB_REFERENCE_SINGLE, + subtype: BBReferenceFieldSubType, + isRequired: boolean ): boolean { - switch (columnSubtype) { - case FieldSubtype.USER: - case FieldSubtype.USERS: { - if (typeof columnData !== "string") { - return false - } - const userArray = parseCsvExport<{ _id: string }[]>(columnData) - if (!Array.isArray(userArray)) { - return false - } + if (typeof data !== "string") { + return false + } - if (columnSubtype === FieldSubtype.USER && userArray.length > 1) { + if (type === FieldType.BB_REFERENCE_SINGLE) { + if (!data) { + return !isRequired + } + const user = parseCsvExport<{ _id: string }>(data) + return db.isGlobalUserID(user._id) + } + + switch (subtype) { + case BBReferenceFieldSubType.USER: + case BBReferenceFieldSubType.USERS: { + const userArray = parseCsvExport<{ _id: string }[]>(data) + if (!Array.isArray(userArray)) { return false } @@ -187,6 +196,6 @@ function isValidBBReference( return !constainsWrongId } default: - throw utils.unreachable(columnSubtype) + throw utils.unreachable(subtype) } } diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts index 0554e0c1e4..1401b75e93 100644 --- a/packages/shared-core/src/filters.ts +++ b/packages/shared-core/src/filters.ts @@ -1,6 +1,6 @@ import { Datasource, - FieldSubtype, + BBReferenceFieldSubType, FieldType, FormulaType, SearchFilter, @@ -9,10 +9,11 @@ import { SearchFilterOperator, SortDirection, SortType, + FieldConstraints, } from "@budibase/types" import dayjs from "dayjs" import { OperatorOptions, SqlNumberTypeRangeMap } from "./constants" -import { deepGet } from "./helpers" +import { deepGet, schema } from "./helpers" const HBS_REGEX = /{{([^{].*?)}}/g @@ -22,11 +23,12 @@ const HBS_REGEX = /{{([^{].*?)}}/g export const getValidOperatorsForType = ( fieldType: { type: FieldType - subtype?: FieldSubtype + subtype?: BBReferenceFieldSubType formulaType?: FormulaType + constraints?: FieldConstraints }, - field: string, - datasource: Datasource & { tableId: any } + field?: string, + datasource?: Datasource & { tableId: any } ) => { const Op = OperatorOptions const stringOps = [ @@ -51,7 +53,7 @@ export const getValidOperatorsForType = ( value: string label: string }[] = [] - const { type, subtype, formulaType } = fieldType + const { type, formulaType } = fieldType if (type === FieldType.STRING) { ops = stringOps } else if (type === FieldType.NUMBER || type === FieldType.BIGINT) { @@ -68,9 +70,12 @@ export const getValidOperatorsForType = ( ops = numOps } else if (type === FieldType.FORMULA && formulaType === FormulaType.STATIC) { ops = stringOps.concat([Op.MoreThan, Op.LessThan]) - } else if (type === FieldType.BB_REFERENCE && subtype == FieldSubtype.USER) { + } else if ( + type === FieldType.BB_REFERENCE_SINGLE || + schema.isDeprecatedSingleUserColumn(fieldType) + ) { ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In] - } else if (type === FieldType.BB_REFERENCE && subtype == FieldSubtype.USERS) { + } else if (type === FieldType.BB_REFERENCE) { ops = [Op.Contains, Op.NotContains, Op.ContainsAny, Op.Empty, Op.NotEmpty] } diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts index e76022b14b..c33ff2ab1e 100644 --- a/packages/shared-core/src/helpers/index.ts +++ b/packages/shared-core/src/helpers/index.ts @@ -1,3 +1,4 @@ export * from "./helpers" export * from "./integrations" export * as cron from "./cron" +export * as schema from "./schema" diff --git a/packages/shared-core/src/helpers/schema.ts b/packages/shared-core/src/helpers/schema.ts new file mode 100644 index 0000000000..985e068be0 --- /dev/null +++ b/packages/shared-core/src/helpers/schema.ts @@ -0,0 +1,15 @@ +import { + BBReferenceFieldSubType, + FieldSchema, + FieldType, +} from "@budibase/types" + +export function isDeprecatedSingleUserColumn( + schema: Pick +) { + const result = + schema.type === FieldType.BB_REFERENCE && + schema.subtype === BBReferenceFieldSubType.USER && + schema.constraints?.type !== "array" + return result +} diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts index 26a7e77cd0..2b3586932a 100644 --- a/packages/shared-core/src/table.ts +++ b/packages/shared-core/src/table.ts @@ -18,6 +18,7 @@ const allowDisplayColumnByType: Record = { [FieldType.LINK]: false, [FieldType.JSON]: false, [FieldType.BB_REFERENCE]: false, + [FieldType.BB_REFERENCE_SINGLE]: false, } const allowSortColumnByType: Record = { @@ -39,6 +40,7 @@ const allowSortColumnByType: Record = { [FieldType.ARRAY]: false, [FieldType.LINK]: false, [FieldType.BB_REFERENCE]: false, + [FieldType.BB_REFERENCE_SINGLE]: false, } export function canBeDisplayColumn(type: FieldType): boolean { diff --git a/packages/types/src/api/web/app/table.ts b/packages/types/src/api/web/app/table.ts index ffe59ae395..c9d63feaab 100644 --- a/packages/types/src/api/web/app/table.ts +++ b/packages/types/src/api/web/app/table.ts @@ -1,5 +1,4 @@ import { - FieldSchema, Row, Table, TableRequest, @@ -31,8 +30,8 @@ export interface BulkImportResponse { } export interface MigrateRequest { - oldColumn: FieldSchema - newColumn: FieldSchema + oldColumn: string + newColumn: string } export interface MigrateResponse { diff --git a/packages/types/src/api/web/application.ts b/packages/types/src/api/web/application.ts index 68c349be5a..bb4d8c7f72 100644 --- a/packages/types/src/api/web/application.ts +++ b/packages/types/src/api/web/application.ts @@ -44,3 +44,6 @@ export interface PublishResponse { status: string appUrl: string } + +export interface UpdateAppRequest extends Partial {} +export interface UpdateAppResponse extends App {} diff --git a/packages/types/src/api/web/auth.ts b/packages/types/src/api/web/auth.ts index 30d129f650..5ca11c4a3b 100644 --- a/packages/types/src/api/web/auth.ts +++ b/packages/types/src/api/web/auth.ts @@ -18,6 +18,7 @@ export interface UpdateSelfRequest { password?: string forceResetPassword?: boolean onboardedAt?: string + freeTrialConfirmedAt?: string appFavourites?: string[] tours?: Record } diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index c3847a2c04..481a051e1c 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -1,6 +1,7 @@ import { Document } from "../document" import { EventEmitter } from "events" import { User } from "../global" +import { ReadStream } from "fs" export enum AutomationIOType { OBJECT = "object", @@ -235,3 +236,18 @@ export interface AutomationMetadata extends Document { errorCount?: number automationChainCount?: number } + +export type AutomationAttachment = { + url: string + filename: string +} + +export type AutomationAttachmentContent = { + filename: string + content: ReadStream | NodeJS.ReadableStream | ReadableStream +} + +export type BucketedContent = AutomationAttachmentContent & { + bucket: string + path: string +} diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts index 865ab4ba64..45436cc9c1 100644 --- a/packages/types/src/documents/app/row.ts +++ b/packages/types/src/documents/app/row.ts @@ -100,13 +100,17 @@ export enum FieldType { */ BIGINT = "bigint", /** - * a JSON type, called User within Budibase. This type is used to represent a link to an internal Budibase + * a JSON type, called Users within Budibase. It will hold an array of strings. This type is used to represent a link to an internal Budibase * resource, like a user or group, today only users are supported. This type will be represented as an * array of internal resource IDs (e.g. user IDs) within the row - this ID list will be enriched with * the full resources when rows are returned from the API. The full resources can be input to the API, or * an array of resource IDs, the API will squash these down and validate them before saving the row. */ BB_REFERENCE = "bb_reference", + /** + * a string type, called User within Budibase. Same logic as `bb_reference`, storing a single id as string instead of an array + */ + BB_REFERENCE_SINGLE = "bb_reference_single", } export interface RowAttachment { @@ -124,16 +128,3 @@ export interface Row extends Document { _viewId?: string [key: string]: any } - -export enum FieldSubtype { - USER = "user", - USERS = "users", -} - -// The 'as' are required for typescript not to type the outputs as generic FieldSubtype -export const FieldTypeSubtypes = { - BB_REFERENCE: { - USER: FieldSubtype.USER as FieldSubtype.USER, - USERS: FieldSubtype.USERS as FieldSubtype.USERS, - }, -} diff --git a/packages/types/src/documents/app/table/constants.ts b/packages/types/src/documents/app/table/constants.ts index 1d9d14695a..210ad1423d 100644 --- a/packages/types/src/documents/app/table/constants.ts +++ b/packages/types/src/documents/app/table/constants.ts @@ -1,3 +1,5 @@ +import { FieldType } from "../row" + export enum RelationshipType { ONE_TO_MANY = "one-to-many", MANY_TO_ONE = "many-to-one", @@ -24,3 +26,24 @@ export enum FormulaType { STATIC = "static", DYNAMIC = "dynamic", } + +export enum BBReferenceFieldSubType { + USER = "user", + /** @deprecated this should not be used anymore, left here in order to support the existing usages */ + USERS = "users", +} + +export type SupportedSqlTypes = + | FieldType.STRING + | FieldType.BARCODEQR + | FieldType.LONGFORM + | FieldType.OPTIONS + | FieldType.DATETIME + | FieldType.NUMBER + | FieldType.BOOLEAN + | FieldType.FORMULA + | FieldType.BIGINT + | FieldType.BB_REFERENCE + | FieldType.BB_REFERENCE_SINGLE + | FieldType.LINK + | FieldType.ARRAY diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts index 63a5876bc0..38424b26b6 100644 --- a/packages/types/src/documents/app/table/schema.ts +++ b/packages/types/src/documents/app/table/schema.ts @@ -1,9 +1,10 @@ // all added by grid/table when defining the // column size, position and whether it can be viewed -import { FieldSubtype, FieldType } from "../row" +import { FieldType } from "../row" import { AutoFieldSubType, AutoReason, + BBReferenceFieldSubType, FormulaType, JsonFieldSubType, RelationshipType, @@ -109,9 +110,14 @@ export interface FormulaFieldMetadata extends BaseFieldSchema { export interface BBReferenceFieldMetadata extends Omit { type: FieldType.BB_REFERENCE - subtype: FieldSubtype.USER | FieldSubtype.USERS + subtype: BBReferenceFieldSubType relationshipType?: RelationshipType } +export interface BBReferenceSingleFieldMetadata + extends Omit { + type: FieldType.BB_REFERENCE_SINGLE + subtype: Exclude +} export interface AttachmentFieldMetadata extends BaseFieldSchema { type: FieldType.ATTACHMENTS @@ -163,6 +169,7 @@ interface OtherFieldMetadata extends BaseFieldSchema { | FieldType.NUMBER | FieldType.LONGFORM | FieldType.BB_REFERENCE + | FieldType.BB_REFERENCE_SINGLE | FieldType.ATTACHMENTS > } @@ -178,6 +185,7 @@ export type FieldSchema = | BBReferenceFieldMetadata | JsonFieldMetadata | AttachmentFieldMetadata + | BBReferenceSingleFieldMetadata export interface TableSchema { [key: string]: FieldSchema @@ -206,15 +214,3 @@ export function isManyToOne( ): field is ManyToOneRelationshipFieldMetadata { return field.relationshipType === RelationshipType.MANY_TO_ONE } - -export function isBBReferenceField( - field: FieldSchema -): field is BBReferenceFieldMetadata { - return field.type === FieldType.BB_REFERENCE -} - -export function isAttachmentField( - field: FieldSchema -): field is AttachmentFieldMetadata { - return field.type === FieldType.ATTACHMENTS -} diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts index 9c7dc80e49..af5c11374d 100644 --- a/packages/types/src/documents/global/user.ts +++ b/packages/types/src/documents/global/user.ts @@ -62,6 +62,7 @@ export interface User extends Document { dayPassRecordedAt?: string userGroups?: string[] onboardedAt?: string + freeTrialConfirmedAt?: string tours?: Record scimInfo?: { isSync: true } & Record appFavourites?: string[] diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts index 016caf8c38..af682cbad1 100644 --- a/packages/types/src/sdk/licensing/plan.ts +++ b/packages/types/src/sdk/licensing/plan.ts @@ -11,6 +11,7 @@ export enum PlanType { /** @deprecated */ BUSINESS = "business", ENTERPRISE_BASIC = "enterprise_basic", + ENTERPRISE_BASIC_TRIAL = "enterprise_basic_trial", ENTERPRISE = "enterprise", } diff --git a/packages/types/src/sdk/locks.ts b/packages/types/src/sdk/locks.ts index c7c028a135..d455e95353 100644 --- a/packages/types/src/sdk/locks.ts +++ b/packages/types/src/sdk/locks.ts @@ -21,7 +21,6 @@ export enum LockName { PERSIST_WRITETHROUGH = "persist_writethrough", QUOTA_USAGE_EVENT = "quota_usage_event", APP_MIGRATION = "app_migrations", - PROCESS_AUTO_COLUMNS = "process_auto_columns", PROCESS_USER_INVITE = "process_user_invite", } diff --git a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts index 8880e587c5..bea627d5b6 100644 --- a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts +++ b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts @@ -1,8 +1,6 @@ jest.unmock("node-fetch") -jest.unmock("aws-sdk") import { TestConfiguration } from "../../../../tests" import { EmailTemplatePurpose } from "../../../../constants" -import { objectStoreTestProviders } from "@budibase/backend-core/tests" import { objectStore } from "@budibase/backend-core" import tk from "timekeeper" import { EmailAttachment } from "@budibase/types" @@ -19,12 +17,10 @@ describe("/api/global/email", () => { beforeAll(async () => { tk.reset() - await objectStoreTestProviders.minio.start() await config.beforeAll() }) afterAll(async () => { - await objectStoreTestProviders.minio.stop() await config.afterAll() }) diff --git a/packages/worker/src/api/routes/global/tests/self.spec.ts b/packages/worker/src/api/routes/global/tests/self.spec.ts index 55eed0bca2..1c0542e885 100644 --- a/packages/worker/src/api/routes/global/tests/self.spec.ts +++ b/packages/worker/src/api/routes/global/tests/self.spec.ts @@ -55,6 +55,7 @@ describe("/api/global/self", () => { const res = await config.api.self .updateSelf(user, { onboardedAt: "2023-03-07T14:10:54.869Z", + freeTrialConfirmedAt: "2024-03-17T14:10:54.869Z", }) .expect(200) @@ -63,6 +64,7 @@ describe("/api/global/self", () => { user._rev = dbUser._rev user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString() expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z") + expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z") expect(res.body._id).toBe(user._id) }) }) diff --git a/packages/worker/src/api/routes/validation/users.ts b/packages/worker/src/api/routes/validation/users.ts index cbd7567457..40cb44d5c6 100644 --- a/packages/worker/src/api/routes/validation/users.ts +++ b/packages/worker/src/api/routes/validation/users.ts @@ -26,6 +26,7 @@ export const buildSelfSaveValidation = () => { firstName: OPTIONAL_STRING, lastName: OPTIONAL_STRING, onboardedAt: Joi.string().optional(), + freeTrialConfirmedAt: Joi.string().optional(), appFavourites: Joi.array().optional(), tours: Joi.object().optional(), } diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts index db9a635356..bf686f647c 100644 --- a/packages/worker/src/utilities/email.ts +++ b/packages/worker/src/utilities/email.ts @@ -6,8 +6,7 @@ import { processString } from "@budibase/string-templates" import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types" import { configs, cache, objectStore } from "@budibase/backend-core" import ical from "ical-generator" -import fetch from "node-fetch" -import path from "path" +import _ from "lodash" const nodemailer = require("nodemailer") @@ -165,39 +164,12 @@ export async function sendEmail( }), } if (opts?.attachments) { - const attachments = await Promise.all( - opts.attachments?.map(async attachment => { - const isFullyFormedUrl = - attachment.url.startsWith("http://") || - attachment.url.startsWith("https://") - if (isFullyFormedUrl) { - const response = await fetch(attachment.url) - if (!response.ok) { - throw new Error(`unexpected response ${response.statusText}`) - } - const fallbackFilename = path.basename( - new URL(attachment.url).pathname - ) - return { - filename: attachment.filename || fallbackFilename, - content: response?.body, - } - } else { - const url = attachment.url - const result = objectStore.extractBucketAndPath(url) - if (result === null) { - throw new Error("Invalid signed URL") - } - const { bucket, path } = result - const readStream = await objectStore.getReadStream(bucket, path) - const fallbackFilename = path.split("/").pop() || "" - return { - filename: attachment.filename || fallbackFilename, - content: readStream, - } - } - }) + let attachments = await Promise.all( + opts.attachments?.map(objectStore.processAutomationAttachment) ) + attachments = attachments.map(attachment => { + return _.omit(attachment, "path") + }) message = { ...message, attachments } } diff --git a/scripts/deploy-camunda.sh b/scripts/deploy-camunda.sh index d01ed64b5a..7059b6f072 100755 --- a/scripts/deploy-camunda.sh +++ b/scripts/deploy-camunda.sh @@ -22,6 +22,7 @@ cd src/main/resources/models echo "deploy processes..." zbctl deploy resource offboarding.bpmn --insecure zbctl deploy resource onboarding.bpmn --insecure +zbctl deploy resource free_trial.bpmn --insecure cd ../../../../../budibase/packages/account-portal/packages/server diff --git a/scripts/killTestcontainers.sh b/scripts/killTestcontainers.sh new file mode 100755 index 0000000000..773d01a962 --- /dev/null +++ b/scripts/killTestcontainers.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Find all Docker containers with the label "org.testcontainers=true" +containers=$(docker ps -q -f "label=org.testcontainers=true") + +# Check if there are any containers to stop +if [ -z "$containers" ]; then + echo "No containers with label 'org.testcontainers=true' found." +else + # Stop the containers + echo "Stopping containers..." + docker stop $containers + + # Remove the containers + echo "Removing containers..." + docker rm $containers + + echo "Containers have been stopped and removed." +fi \ No newline at end of file diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js deleted file mode 100755 index 14ee222ce7..0000000000 --- a/scripts/syncProPackage.js +++ /dev/null @@ -1,41 +0,0 @@ -const fs = require("fs") -const path = require("path") -const { execSync } = require("child_process") - -let version = "0.0.0" -const localPro = fs.existsSync("packages/pro/src") -if (!localPro) { - version = "latest" -} - -// Get the list of workspaces with mismatched dependencies -const output = execSync("yarn --silent workspaces info --json", { - encoding: "utf-8", -}) -const data = JSON.parse(output) - -// Loop through each workspace and update the dependencies -Object.keys(data).forEach(workspace => { - // Loop through each dependency and update its version in package.json - const packageJsonPath = path.join(data[workspace].location, "package.json") - const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) - if (packageJson.version !== "0.0.0") { - // Don't change if we are not using local versions - return - } - - let hasChanges = false - - if (packageJson.dependencies && packageJson.dependencies["@budibase/pro"]) { - packageJson.dependencies["@budibase/pro"] = version - hasChanges = true - } - - // Write changes to package.json if there are any - if (hasChanges) { - fs.writeFileSync( - packageJsonPath, - JSON.stringify(packageJson, null, 2) + "\n" - ) - } -}) diff --git a/yarn.lock b/yarn.lock index 30b275c434..94896f550e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1988,7 +1988,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.10.5", "@babel/runtime@^7.13.10": +"@babel/runtime@^7.10.5": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== @@ -2002,6 +2002,13 @@ dependencies: regenerator-runtime "^0.14.0" +"@babel/runtime@^7.13.10": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c" + integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" @@ -2046,6 +2053,44 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.23.12": + version "0.0.0" + dependencies: + "@budibase/nano" "10.1.5" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/shared-core" "0.0.0" + "@budibase/types" "0.0.0" + "@govtechsg/passport-openidconnect" "^1.0.2" + aws-cloudfront-sign "3.0.2" + aws-sdk "2.1030.0" + bcrypt "5.1.0" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dd-trace "5.2.0" + dotenv "16.0.1" + ioredis "5.3.2" + joi "17.6.0" + jsonwebtoken "9.0.2" + koa-passport "^6.0.0" + koa-pino-logger "4.0.0" + lodash "4.17.21" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + pino "8.11.0" + pino-http "8.3.3" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + rotating-file-stream "3.1.0" + sanitize-s3-objectkey "0.0.1" + semver "^7.5.4" + tar-fs "2.1.1" + uuid "^8.3.2" + "@budibase/handlebars-helpers@^0.13.1": version "0.13.1" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.1.tgz#d02e73c0df8305cd675e70dc37f8427eb0842080" @@ -2090,6 +2135,44 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" +"@budibase/pro@npm:@budibase/pro@latest": + version "2.23.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.23.12.tgz#b2e813c547a5ed22b5bd86b1158159fe4b918260" + integrity sha512-DMtfkrJDSIF9V7AL6brpuWWw7Ot5XxO4YQ32ggmr0264uU9KYsTFvlFXFP3MSF2H+247ZYUouSJU76+XeC13qQ== + dependencies: + "@budibase/backend-core" "2.23.12" + "@budibase/shared-core" "2.23.12" + "@budibase/string-templates" "2.23.12" + "@budibase/types" "2.23.12" + "@koa/router" "8.0.8" + bull "4.10.1" + joi "17.6.0" + jsonwebtoken "9.0.2" + lru-cache "^7.14.1" + memorystream "^0.3.1" + node-fetch "2.6.7" + scim-patch "^0.8.1" + scim2-parse-filter "^0.2.8" + +"@budibase/shared-core@2.23.12": + version "0.0.0" + dependencies: + "@budibase/types" "0.0.0" + cron-validate "1.4.5" + +"@budibase/string-templates@2.23.12": + version "0.0.0" + dependencies: + "@budibase/handlebars-helpers" "^0.13.1" + dayjs "^1.10.8" + handlebars "^4.7.8" + lodash.clonedeep "^4.5.0" + +"@budibase/types@2.23.12": + version "0.0.0" + dependencies: + scim-patch "^0.8.1" + "@bull-board/api@5.10.2": version "5.10.2" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-5.10.2.tgz#ae8ff6918b23897bf879a6ead3683f964374c4b3" @@ -2675,7 +2758,7 @@ "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" -"@grpc/proto-loader@0.7.10", "@grpc/proto-loader@^0.7.0", "@grpc/proto-loader@^0.7.8": +"@grpc/proto-loader@0.7.10", "@grpc/proto-loader@^0.7.0": version "0.7.10" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.10.tgz#6bf26742b1b54d0a473067743da5d3189d06d720" integrity sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ== @@ -2685,6 +2768,16 @@ protobufjs "^7.2.4" yargs "^17.7.2" +"@grpc/proto-loader@^0.7.8": + version "0.7.13" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf" + integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw== + dependencies: + lodash.camelcase "^4.3.0" + long "^5.0.0" + protobufjs "^7.2.5" + yargs "^17.7.2" + "@hapi/hoek@^9.0.0": version "9.3.0" resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" @@ -4700,17 +4793,17 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== -"@spectrum-css/button@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" - integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== - "@spectrum-css/buttongroup@3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== -"@spectrum-css/card@^3.0.3": +"@spectrum-css/calendar@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@spectrum-css/calendar/-/calendar-3.2.7.tgz#10fd44176b6afbdf5baf29ce16728baa98b0d844" + integrity sha512-e2BGyuXzP+VOv0q855EIgrR+ne7e/EP8AMMuSAWazgq2fPZ4CoJIeLYP3tnniKnj2dlb3Gr1LH+6MPlUXS74RA== + +"@spectrum-css/card@3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== @@ -4732,13 +4825,6 @@ dependencies: "@spectrum-css/vars" "^3.0.2" -"@spectrum-css/divider@^1.0.3": - version "1.0.27" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" - integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== - dependencies: - "@spectrum-css/vars" "^8.0.0" - "@spectrum-css/dropzone@3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" @@ -4784,11 +4870,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== -"@spectrum-css/link@^3.1.3": - version "3.1.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" - integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== - "@spectrum-css/menu@3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" @@ -4876,11 +4957,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - "@spectrum-css/tags@3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" @@ -4911,11 +4987,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== -"@spectrum-css/typography@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" - integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== - "@spectrum-css/underlay@2.0.9": version "2.0.9" resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" @@ -4936,11 +5007,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.1.tgz#d333fa41909f691c8750b5c15ad9ba029df2248e" integrity sha512-rX6Iasu9BsFMVgEN0vGRPm9dmSxva+IK/uqQAa9HM0lliwqUiFrJxrFXHHpiAgNuux/U4srEJwbSpGzfF+CegQ== -"@spectrum-css/vars@^8.0.0": - version "8.0.4" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.4.tgz#dcf115551f240b25ba629a3b6c4d3eb1429bee15" - integrity sha512-3jYj5HYxbVfkR4jLV9l+L3g6jS4R09m0lV+gupqnXWpwcThlP0EOjkCkevu195imoS4pZ/i2iLpd98l4qcTc2Q== - "@sveltejs/vite-plugin-svelte@1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.4.0.tgz#412a735de489ca731d0c780c2b410f45dd95b392" @@ -5680,9 +5746,9 @@ integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg== "@types/node@>=8.1.0": - version "20.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.10.tgz#6c3de8974d65c362f82ee29db6b5adf4205462f9" - integrity sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg== + version "20.12.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76" + integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw== dependencies: undici-types "~5.26.4" @@ -5701,9 +5767,9 @@ undici-types "~5.26.4" "@types/nodemailer@^6.4.4": - version "6.4.14" - resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.14.tgz#5c81a5e856db7f8ede80013e6dbad7c5fb2283e2" - integrity sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA== + version "6.4.15" + resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.15.tgz#494be695e11c438f7f5df738fb4ab740312a6ed2" + integrity sha512-0EBJxawVNjPkng1zm2vopRctuWVCxk34JcIlRuXSf54habUWdz1FB7wHDqOqvDa8Mtpt0Q3LTXQkAs2LNyK5jQ== dependencies: "@types/node" "*" @@ -5743,9 +5809,9 @@ "@types/passport-oauth2" "*" "@types/passport-oauth2@*": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@types/passport-oauth2/-/passport-oauth2-1.4.15.tgz#34f2684f53aad36e664cd01ca9879224229f47e7" - integrity sha512-9cUTP/HStNSZmhxXGuRrBJfEWzIEJRub2eyJu3CvkA+8HAMc9W3aKdFhVq+Qz1hi42qn+GvSAnz3zwacDSYWpw== + version "1.4.16" + resolved "https://registry.yarnpkg.com/@types/passport-oauth2/-/passport-oauth2-1.4.16.tgz#59189a9d69783a63d7fb92d19cd28f96c95740af" + integrity sha512-Sdr0rpAdkiidUOtyaapGgvXyMjqYlMTFHRy7gtJtzr0/ysEIa72N3j2FSHIRc14h29g1+dzDl8IW2WT2Mu29vQ== dependencies: "@types/express" "*" "@types/oauth" "*" @@ -5930,6 +5996,14 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/readable-stream@^4.0.0": + version "4.0.11" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.11.tgz#684f1e947c90cb6a8ad3904523d650bb66cdbb84" + integrity sha512-R3eUMUTTKoIoaz7UpYLxvZCrOmCRPRbAmoDDHKcimTEySltaJhF8hLzj4+EzyDifiX5eK6oDQGSfmNnXjxZzYQ== + dependencies: + "@types/node" "*" + safe-buffer "~5.1.1" + "@types/readdir-glob@*": version "1.1.5" resolved "https://registry.yarnpkg.com/@types/readdir-glob/-/readdir-glob-1.1.5.tgz#21a4a98898fc606cb568ad815f2a0eedc24d412a" @@ -8118,6 +8192,17 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: get-intrinsic "^1.2.1" set-function-length "^1.1.1" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" @@ -9319,11 +9404,16 @@ dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.8, dayjs@^1.8.15: +dayjs@^1.10.8: version "1.11.10" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== +dayjs@^1.8.15: + version "1.11.11" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e" + integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg== + dc-polyfill@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.3.tgz#fe9eefc86813439dd46d6f9ad9582ec079c39720" @@ -9576,6 +9666,15 @@ define-data-property@^1.0.1, define-data-property@^1.1.0, define-data-property@^ gopd "^1.0.1" has-property-descriptors "^1.0.0" +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-lazy-prop@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" @@ -10054,9 +10153,9 @@ dotenv@8.6.0, dotenv@^8.2.0: integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== dotenv@^16.3.1: - version "16.4.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11" - integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ== + version "16.4.5" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== dotenv@~10.0.0: version "10.0.0" @@ -10175,9 +10274,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== ejs@^3.1.7: - version "3.1.9" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" - integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" @@ -10425,6 +10524,18 @@ es-aggregate-error@^1.0.9: has-property-descriptors "^1.0.0" set-function-name "^2.0.1" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-get-iterator@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" @@ -11105,9 +11216,9 @@ fast-xml-parser@4.2.5: strnum "^1.0.5" fast-xml-parser@^4.1.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.3.tgz#aeaf5778392329f17168c40c51bcbfec8ff965be" - integrity sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg== + version "4.3.6" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz#190f9d99097f0c8f2d3a0e681a10404afca052ff" + integrity sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw== dependencies: strnum "^1.0.5" @@ -11335,11 +11446,6 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatpickr@^4.5.2: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - flatted@^3.1.0: version "3.2.5" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" @@ -11437,9 +11543,9 @@ formidable@^2.1.2: qs "^6.11.0" fp-ts@^2.5.1: - version "2.16.2" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.16.2.tgz#7faa90f6fc2e8cf84c711d2c4e606afe2be9e342" - integrity sha512-CkqAjnIKFqvo3sCyoBTqgJvF+bHrSik584S9nhTjtBESLx26cbtVMR/T9a6ApChOcSDAaM3JydDmWDUn4EEXng== + version "2.16.5" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.16.5.tgz#d79b97168aeafcf9612f18bbc017f513ecb20ac9" + integrity sha512-N8T8PwMSeTKKtkm9lkj/zSTAnPC/aJIIrQhnHxxkL0KLsRCNUPANksJOlMXxcKKCo7H1ORP3No9EMD+fP0tsdA== fresh@^0.5.2, fresh@~0.5.2: version "0.5.2" @@ -11506,7 +11612,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2: +fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== @@ -11669,6 +11775,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" +get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-object@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" @@ -12289,6 +12406,13 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" @@ -16133,10 +16257,10 @@ mute-stream@~1.0.0: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== -mysql2@3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.5.2.tgz#a06050e1514e9ac15711a8b883ffd51cb44b2dc8" - integrity sha512-cptobmhYkYeTBIFp2c0piw2+gElpioga1rUw5UidHvo8yaHijMZoo8A3zyBVoo/K71f7ZFvrShA9iMIy9dCzCA== +mysql2@3.9.7: + version "3.9.7" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.9.7.tgz#843755daf65b5ef08afe545fe14b8fb62824741a" + integrity sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw== dependencies: denque "^2.1.0" generate-function "^2.3.1" @@ -18191,9 +18315,9 @@ posthog-js@^1.118.0: preact "^10.19.3" posthog-js@^1.13.4: - version "1.103.1" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.103.1.tgz#f846c413c28aca204dc1527f49d39f651348f3c4" - integrity sha512-cFXFU4Z4kl/+RUUV4ju1DlfM7dwCGi6H9xWsfhljIhGcBbT8UfS4JGgZGXl9ABQDdgDPb9xciqnysFSsUQshTA== + version "1.131.3" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.131.3.tgz#bd3e6123dc715f089825a92d3ec62480b7ec0a76" + integrity sha512-ds/TADDS+rT/WgUyeW4cJ+X+fX+O1KdkOyssNI/tP90PrFf0IJsck5B42YOLhfz87U2vgTyBaKHkdlMgWuOFog== dependencies: fflate "^0.4.8" preact "^10.19.3" @@ -18436,9 +18560,9 @@ pprof-format@^2.0.7: integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA== preact@^10.19.3: - version "10.19.3" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.3.tgz#7a7107ed2598a60676c943709ea3efb8aaafa899" - integrity sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ== + version "10.20.1" + resolved "https://registry.yarnpkg.com/preact/-/preact-10.20.1.tgz#1bc598ab630d8612978f7533da45809a8298542b" + integrity sha512-JIFjgFg9B2qnOoGiYMVBtrcFxHqn+dNXbq76bVmcaHYJFYR4lW67AOcXgAYQQTDYXDOg/kTZrKPNCdRgJ2UJmw== prebuild-install@^7.1.1: version "7.1.1" @@ -18834,7 +18958,14 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@^6.10.3, qs@^6.11.0, qs@^6.4.0: +qs@^6.10.3: + version "6.12.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a" + integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ== + dependencies: + side-channel "^1.0.6" + +qs@^6.11.0, qs@^6.4.0: version "6.11.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== @@ -19630,13 +19761,6 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.8.1, dependencies: estree-walker "^0.6.1" -rollup@2.45.2: - version "2.45.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48" - integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ== - optionalDependencies: - fsevents "~2.3.1" - rollup@^2.36.2, rollup@^2.45.2: version "2.79.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" @@ -19916,6 +20040,18 @@ set-function-length@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + set-function-name@^2.0.0, set-function-name@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" @@ -20007,6 +20143,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + siginfo@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30" @@ -20936,20 +21082,6 @@ svelte-dnd-action@^0.9.8: postcss "^8.4.29" postcss-scss "^4.0.8" -svelte-flatpickr@3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8" - integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw== - dependencies: - flatpickr "^4.5.2" - -svelte-flatpickr@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.3.4.tgz#80b1ed2d6bc37df78b1660404e9326bfc0a206f4" - integrity sha512-i+QqJRs8zPRKsxv8r2GIk1fsb8cI3ozn3/aHXtViAoNKLy0j4PV7OSWavgEZC1wlAa34qi2hMkUh+vg6qt2DRA== - dependencies: - flatpickr "^4.5.2" - svelte-hmr@^0.15.1: version "0.15.3" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.15.3.tgz#df54ccde9be3f091bf5f18fc4ef7b8eb6405fbe6" @@ -23033,9 +23165,9 @@ z-schema@^5.0.1: commander "^9.4.1" zeebe-node@^8.2.5: - version "8.3.1" - resolved "https://registry.yarnpkg.com/zeebe-node/-/zeebe-node-8.3.1.tgz#e100bf3708464e305305b4efa1ffde53f9786c45" - integrity sha512-68ascWO3g7g+9WwDzvfa3I9TkLKHku5auEgSINP+k5ktNfsfGW68ELDmEJA+XHZgzvGsdGILZqGRzVd5SC8aaQ== + version "8.3.2" + resolved "https://registry.yarnpkg.com/zeebe-node/-/zeebe-node-8.3.2.tgz#64d156b715f03f8637054aeedb3d3024b4a09db4" + integrity sha512-3/xbiTvhaa668JHtMEwELv5dN6HR7Qw8gzmCdjp3Brj6ekdhROVx8x/0JWKSV3Mx64ac3+eEc+9nB5+ZXcO/bg== dependencies: "@grpc/grpc-js" "1.9.7" "@grpc/proto-loader" "0.7.10"