From b1b861139dbb1d607978395e5df2d9f468054316 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 5 Sep 2024 14:25:04 +0100 Subject: [PATCH 1/6] feature flag the branch action definition --- packages/backend-core/src/features/index.ts | 1 + packages/server/src/automations/actions.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts index 49f8044e8f..5951bbc292 100644 --- a/packages/backend-core/src/features/index.ts +++ b/packages/backend-core/src/features/index.ts @@ -267,6 +267,7 @@ export class FlagSet, T extends { [key: string]: V }> { // default values set correctly and their types flow through the system. export const flags = new FlagSet({ DEFAULT_VALUES: Flag.boolean(env.isDev()), + AUTOMATION_BRANCHING: Flag.boolean(env.isDev()), SQS: Flag.boolean(env.isDev()), [FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(false), }) diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts index 2058723faa..a9b839fedd 100644 --- a/packages/server/src/automations/actions.ts +++ b/packages/server/src/automations/actions.ts @@ -16,6 +16,7 @@ import * as delay from "./steps/delay" import * as queryRow from "./steps/queryRows" import * as loop from "./steps/loop" import * as collect from "./steps/collect" +import * as branch from "./steps/branch" import * as triggerAutomationRun from "./steps/triggerAutomationRun" import env from "../environment" import { @@ -25,9 +26,11 @@ import { Hosting, ActionImplementation, AutomationStepDefinition, + FeatureFlag, } from "@budibase/types" import sdk from "../sdk" import { getAutomationPlugin } from "../utilities/fileSystem" +import { features } from "@budibase/backend-core" type ActionImplType = ActionImplementations< typeof env.SELF_HOSTED extends "true" ? Hosting.SELF : Hosting.CLOUD @@ -98,6 +101,9 @@ if (env.SELF_HOSTED) { } export async function getActionDefinitions() { + if (await features.flags.isEnabled("AUTOMATION_BRANCHING")) { + BUILTIN_ACTION_DEFINITIONS["BRANCH"] = branch.definition + } const actionDefinitions = BUILTIN_ACTION_DEFINITIONS if (env.SELF_HOSTED) { const plugins = await sdk.plugins.fetch(PluginType.AUTOMATION) From 2f13773240dd1d93286cc75a626dce5f545d3e63 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:46:08 +0100 Subject: [PATCH 2/6] Add old roles (#14538) --- packages/frontend-core/src/constants.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 1f82610408..d2f25b351a 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -76,7 +76,9 @@ export const ExtendedBudibaseRoleOptions = [ value: BudibaseRoles.Owner, sortOrder: 0, }, -].concat(BudibaseRoleOptions) +] + .concat(BudibaseRoleOptions) + .concat(BudibaseRoleOptionsOld) export const PlanType = { FREE: "free", From 68678235d63de9f3ec74e44c2a7e8358c7f6f38d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 9 Sep 2024 10:52:12 +0000 Subject: [PATCH 3/6] Bump version to 2.31.8 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index f24c0e095b..0292b863e8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.31.7", + "version": "2.31.8", "npmClient": "yarn", "packages": [ "packages/*", From bb3dd6e27ac98b62b6a562ed584e77314dee3597 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Sep 2024 15:23:06 +0200 Subject: [PATCH 4/6] Fix relationship popover click behaviour --- .../src/components/grid/overlays/GridPopover.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte b/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte index ac2a998428..9f79a5eb22 100644 --- a/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte +++ b/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte @@ -44,6 +44,7 @@ {wrap} portalTarget="#{gridID} .grid-popover-container" offset={0} + clickOutsideOverride >
Date: Mon, 9 Sep 2024 14:26:37 +0100 Subject: [PATCH 5/6] remove uneeded import --- packages/server/src/automations/actions.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts index a9b839fedd..f78174aa7a 100644 --- a/packages/server/src/automations/actions.ts +++ b/packages/server/src/automations/actions.ts @@ -26,7 +26,6 @@ import { Hosting, ActionImplementation, AutomationStepDefinition, - FeatureFlag, } from "@budibase/types" import sdk from "../sdk" import { getAutomationPlugin } from "../utilities/fileSystem" From 725aa180609ba4211b42381933efb722bde084d7 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Sep 2024 16:05:09 +0200 Subject: [PATCH 6/6] Fix long popover for relationship column pickers --- .../src/components/grid/controls/ColumnsSettingContent.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte index 02ed0a504c..79e457aa16 100644 --- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte +++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte @@ -219,7 +219,7 @@ on:close={() => (relationshipFieldName = null)} open={relationshipFieldName} anchor={relationshipPanelAnchor} - align="right-outside" + align="left" > {#if relationshipPanelColumns.length}