diff --git a/lerna.json b/lerna.json index d9d78eb964..ed68735461 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 116db847b0..1a2ee15375 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.212-alpha.10", + "@budibase/types": "^1.0.212-alpha.12", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/backend-core/src/context/index.js b/packages/backend-core/src/context/index.js index a69a381f0f..bd4d857ef2 100644 --- a/packages/backend-core/src/context/index.js +++ b/packages/backend-core/src/context/index.js @@ -314,6 +314,7 @@ function getContextDB(key, opts) { toUseAppId = getDevelopmentAppID(appId) break } + db = dangerousGetDB(toUseAppId, opts) try { cls.setOnContext(key, db) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 0c590eccf4..f6d29b874c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.212-alpha.10", + "@budibase/string-templates": "^1.0.212-alpha.12", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte index 4dda31240a..246323244a 100644 --- a/packages/bbui/src/Table/CellRenderer.svelte +++ b/packages/bbui/src/Table/CellRenderer.svelte @@ -26,12 +26,20 @@ array: ArrayRenderer, internal: InternalRenderer, } - $: type = schema?.type ?? "string" + $: type = getType(schema) $: customRenderer = customRenderers?.find(x => x.column === schema?.name) $: renderer = customRenderer?.component ?? typeMap[type] ?? StringRenderer $: width = schema?.width || "150px" $: cellValue = getCellValue(value, schema.template) + const getType = schema => { + // Use a string renderer for dates if we use a custom template + if (schema?.type === "datetime" && schema?.template) { + return "string" + } + return schema?.type || "string" + } + const getCellValue = (value, template) => { if (!template) { return value diff --git a/packages/builder/package.json b/packages/builder/package.json index 8fc012ad29..c1b342f320 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.212-alpha.10", - "@budibase/client": "^1.0.212-alpha.10", - "@budibase/frontend-core": "^1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.12", + "@budibase/client": "^1.0.212-alpha.12", + "@budibase/frontend-core": "^1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.12", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte index 48ebddbcf1..cf85b2506b 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte @@ -178,7 +178,7 @@ .column { gap: var(--spacing-l); display: grid; - grid-template-columns: 20px 1fr 1fr auto auto; + grid-template-columns: 20px 1fr 1fr 16px 16px; align-items: center; border-radius: var(--border-radius-s); transition: background-color ease-in-out 130ms; diff --git a/packages/cli/package.json b/packages/cli/package.json index 8738159bb5..80914ff41e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 6e8ca24cb0..707ab74a2b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.212-alpha.10", - "@budibase/frontend-core": "^1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.12", + "@budibase/frontend-core": "^1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.12", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ef0bdc5bd6..8a4bdcf87e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 8a427aa899..6fa60da9c9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.212-alpha.10", - "@budibase/client": "^1.0.212-alpha.10", - "@budibase/pro": "1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", - "@budibase/types": "^1.0.212-alpha.10", + "@budibase/backend-core": "^1.0.212-alpha.12", + "@budibase/client": "^1.0.212-alpha.12", + "@budibase/pro": "1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.12", + "@budibase/types": "^1.0.212-alpha.12", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 3de0b67819..f2e22f7e45 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -50,6 +50,7 @@ const { getAppDB, getProdAppDB, updateAppId, + doInAppContext, } = require("@budibase/backend-core/context") import { getUniqueRows } from "../../utilities/usageQuota/rows" import { quotas } from "@budibase/pro" @@ -549,22 +550,24 @@ export const sync = async (ctx: any, next: any) => { } const updateAppPackage = async (appPackage: any, appId: any) => { - const db = getAppDB() - const application = await db.get(DocumentTypes.APP_METADATA) + return doInAppContext(appId, async () => { + const db = getAppDB() + const application = await db.get(DocumentTypes.APP_METADATA) - const newAppPackage = { ...application, ...appPackage } - if (appPackage._rev !== application._rev) { - newAppPackage._rev = application._rev - } + const newAppPackage = { ...application, ...appPackage } + if (appPackage._rev !== application._rev) { + newAppPackage._rev = application._rev + } - // the locked by property is attached by server but generated from - // Redis, shouldn't ever store it - delete newAppPackage.lockedBy + // the locked by property is attached by server but generated from + // Redis, shouldn't ever store it + delete newAppPackage.lockedBy - await db.put(newAppPackage) - // remove any cached metadata, so that it will be updated - await appCache.invalidateAppMetadata(appId) - return newAppPackage + await db.put(newAppPackage) + // remove any cached metadata, so that it will be updated + await appCache.invalidateAppMetadata(appId) + return newAppPackage + }) } const createEmptyAppPackage = async (ctx: any, app: any) => { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7649d7eb2c..753956b2fa 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ed0ae25fe6..44411fe107 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c729609e1c..a0927a502a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.212-alpha.10", - "@budibase/pro": "1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", - "@budibase/types": "^1.0.212-alpha.10", + "@budibase/backend-core": "^1.0.212-alpha.12", + "@budibase/pro": "1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.12", + "@budibase/types": "^1.0.212-alpha.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2",