diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 01cd20f605..9ac8a1e7c6 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -139,6 +139,8 @@ spec: value: {{ .Values.globals.automationMaxIterations | quote }} - name: TENANT_FEATURE_FLAGS value: {{ .Values.globals.tenantFeatureFlags | quote }} + - name: ENCRYPTION_KEY + value: {{ .Values.globals.bbEncryptionKey | quote }} {{ if .Values.globals.bbAdminUserEmail }} - name: BB_ADMIN_USER_EMAIL value: {{ .Values.globals.bbAdminUserEmail | quote }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index ff56fb5019..a16f839ea7 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -146,6 +146,8 @@ spec: value: {{ .Values.globals.google.secret | quote }} - name: TENANT_FEATURE_FLAGS value: {{ .Values.globals.tenantFeatureFlags | quote }} + - name: ENCRYPTION_KEY + value: {{ .Values.globals.bbEncryptionKey | quote }} {{ if .Values.globals.elasticApmEnabled }} - name: ELASTIC_APM_ENABLED value: {{ .Values.globals.elasticApmEnabled | quote }} diff --git a/lerna.json b/lerna.json index 0360b2e821..6409aeece9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.54", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 81898f6d0b..665f910775 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.54", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.54", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 18092ae2a5..368f4caeb3 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": "2.2.12-alpha.50", + "version": "2.2.12-alpha.54", "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": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.54", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index cc4417be2a..640f696458 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -86,7 +86,7 @@ margin-left: 0; transition: color ease-out 130ms; } - .is-selected:not(.spectrum-ActionButton--emphasized) { + .is-selected:not(.spectrum-ActionButton--emphasized):not(.spectrum-ActionButton--quiet) { background: var(--spectrum-global-color-gray-300); border-color: var(--spectrum-global-color-gray-700); } diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index 09264d5250..1884bbf2d6 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -16,10 +16,10 @@ export default function positionDropdown( top: null, } - let popoverLeftPad = 20 - // Determine vertical styles - if (window.innerHeight - anchorBounds.bottom < 100) { + if (align === "right-outside") { + styles.top = anchorBounds.top + } else if (window.innerHeight - anchorBounds.bottom < 100) { styles.top = anchorBounds.top - elementBounds.height - 5 } else { styles.top = anchorBounds.bottom + 5 @@ -34,15 +34,9 @@ export default function positionDropdown( styles.minWidth = anchorBounds.width } if (align === "right") { - let left = - anchorBounds.left + anchorBounds.width / 2 - elementBounds.width - // Accommodate margin on popover: 1.25rem; ~20px - if (left + elementBounds.width + popoverLeftPad > window.innerWidth) { - left -= 20 - } - styles.left = left - } else if (align === "right-side") { - styles.left = anchorBounds.left + anchorBounds.width + styles.left = anchorBounds.left + anchorBounds.width - elementBounds.width + } else if (align === "right-outside") { + styles.left = anchorBounds.right + 10 } else { styles.left = anchorBounds.left } diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index f40d6556e5..eb2d6baca9 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -247,10 +247,6 @@ width: 100%; } - .no-variables-height { - height: 100px; - } - .no-variables-text { padding: var(--spacing-m); color: var(--spectrum-global-color-gray-600); diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 576c4b9338..c32f93ea2a 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -15,15 +15,10 @@ export let portalTarget export let dataCy export let maxWidth - export let direction = "bottom" - export let showTip = false export let open = false export let useAnchorWidth = false export let dismissible = true - $: tooltipClasses = showTip - ? `spectrum-Popover--withTip spectrum-Popover--${direction}` - : "" $: target = portalTarget || getContext(Context.PopoverRoot) || ".spectrum" export const show = () => { @@ -62,29 +57,31 @@ {#if open} - -
{}, - anchor, - }} - on:keydown={handleEscape} - class={"spectrum-Popover is-open " + (tooltipClasses || "")} - role="presentation" - data-cy={dataCy} - transition:fly|local={{ y: -20, duration: 200 }} - > - -
-
+ {#key anchor} + +
{}, + anchor, + }} + on:keydown={handleEscape} + class="spectrum-Popover is-open" + role="presentation" + data-cy={dataCy} + transition:fly|local={{ y: -20, duration: 200 }} + > + +
+
+ {/key} {/if} diff --git a/packages/builder/package.json b/packages/builder/package.json index 27ee30f56d..4ccbc2f5ff 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.54", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,13 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", - "@budibase/client": "2.2.12-alpha.50", - "@budibase/frontend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.54", + "@budibase/client": "2.2.12-alpha.54", + "@budibase/frontend-core": "2.2.12-alpha.54", + "@budibase/string-templates": "2.2.12-alpha.54", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 04846e01bf..f31f45bb84 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -3,7 +3,6 @@ import { routes } from "../.routify/routes" import { NotificationDisplay, BannerDisplay } from "@budibase/bbui" import { parse, stringify } from "qs" - import HelpIcon from "components/common/HelpIcon.svelte" import LicensingOverlays from "components/portal/licensing/LicensingOverlays.svelte" const queryHandler = { parse, stringify } @@ -15,7 +14,6 @@