diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte index c99de272f5..6408ac82d5 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte @@ -19,7 +19,7 @@ export let lastStep let syncAutomationsEnabled = $licensing.syncAutomationsEnabled - let triggerAutomationsEnabled = $licensing.triggerAutomationsEnabled + let triggerAutomationRunEnabled = $licensing.triggerAutomationRunEnabled let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK] let selectedAction let actionVal @@ -38,8 +38,8 @@ disabled: !lastStep || !syncAutomationsEnabled || collectBlockExists, message: collectDisabledMessage(), }, - TRIGGER: { - disabled: !triggerAutomationsEnabled, + TRIGGER_AUTOMATION_RUN: { + disabled: !triggerAutomationRunEnabled, message: collectDisabledMessage(), }, } @@ -155,7 +155,7 @@
{action.name} - {#if isDisabled && !syncAutomationsEnabled && !triggerAutomationsEnabled && lockedFeatures.includes(action.stepId)} + {#if isDisabled && !syncAutomationsEnabled && !triggerAutomationRunEnabled && lockedFeatures.includes(action.stepId)}
Premium diff --git a/packages/builder/src/constants/backend/automations.js b/packages/builder/src/constants/backend/automations.js index f26e2a7424..6981418fa7 100644 --- a/packages/builder/src/constants/backend/automations.js +++ b/packages/builder/src/constants/backend/automations.js @@ -21,7 +21,7 @@ export const ActionStepID = { QUERY_ROWS: "QUERY_ROWS", LOOP: "LOOP", COLLECT: "COLLECT", - TRIGGER: "TRIGGER", + TRIGGER_AUTOMATION_RUN: "TRIGGER_AUTOMATION_RUN", // these used to be lowercase step IDs, maintain for backwards compat discord: "discord", slack: "slack", diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index daf4b0ce86..8fef367f77 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -125,8 +125,8 @@ export const createLicensingStore = () => { const syncAutomationsEnabled = license.features.includes( Constants.Features.SYNC_AUTOMATIONS ) - const triggerAutomationsEnabled = license.features.includes( - Constants.Features.SYNC_AUTOMATIONS + const triggerAutomationRunEnabled = license.features.includes( + Constants.Features.TRIGGER_AUTOMATION_RUN ) const perAppBuildersEnabled = license.features.includes( @@ -151,7 +151,7 @@ export const createLicensingStore = () => { auditLogsEnabled, enforceableSSO, syncAutomationsEnabled, - triggerAutomationsEnabled, + triggerAutomationRunEnabled, isViewPermissionsEnabled, perAppBuildersEnabled, } diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts index a3997ad21c..90e1d10d2c 100644 --- a/packages/server/src/automations/actions.ts +++ b/packages/server/src/automations/actions.ts @@ -15,7 +15,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 trigger from "./steps/trigger" +import * as triggerAutomationRun from "./steps/triggerAutomationRun" import env from "../environment" import { AutomationStepSchema, @@ -42,7 +42,7 @@ const ACTION_IMPLS: Record< FILTER: filter.run, QUERY_ROWS: queryRow.run, COLLECT: collect.run, - TRIGGER: trigger.run, + TRIGGER: triggerAutomationRun.run, // these used to be lowercase step IDs, maintain for backwards compat discord: discord.run, slack: slack.run, @@ -64,7 +64,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record = QUERY_ROWS: queryRow.definition, LOOP: loop.definition, COLLECT: collect.definition, - TRIGGER: trigger.definition, + TRIGGER: triggerAutomationRun.definition, // these used to be lowercase step IDs, maintain for backwards compat discord: discord.definition, slack: slack.definition, diff --git a/packages/server/src/automations/steps/triggerAutomationRun.ts b/packages/server/src/automations/steps/triggerAutomationRun.ts index faee0687df..d0e0e0a367 100644 --- a/packages/server/src/automations/steps/triggerAutomationRun.ts +++ b/packages/server/src/automations/steps/triggerAutomationRun.ts @@ -12,7 +12,7 @@ import * as triggers from "../triggers" import { db as dbCore, context } from "@budibase/backend-core" export const definition: AutomationStepSchema = { - name: "Trigger Automation", + name: "Trigger an automation", tagline: "Triggers an automation synchronously", icon: "Sync", description: "Triggers an automation synchronously", diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts index 65d852e627..a3f149d6da 100644 --- a/packages/types/src/sdk/licensing/feature.ts +++ b/packages/types/src/sdk/licensing/feature.ts @@ -9,7 +9,7 @@ export enum Feature { BRANDING = "branding", SCIM = "scim", SYNC_AUTOMATIONS = "syncAutomations", - TRIGGER_AUTOMATION = "triggerAutomation", + TRIGGER_AUTOMATION_RUN = "triggerAutomationRun", APP_BUILDERS = "appBuilders", OFFLINE = "offline", EXPANDED_PUBLIC_API = "expandedPublicApi",