MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more naming updates

This commit is contained in:
Peter Clement 2024-01-15 10:11:16 +00:00
parent 601ec35549
commit 394a8c4d94
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
View File

@ -19,7 +19,7 @@
export let lastStep export let lastStep
let syncAutomationsEnabled = $licensing.syncAutomationsEnabled let syncAutomationsEnabled = $licensing.syncAutomationsEnabled
let triggerAutomationsEnabled = $licensing.triggerAutomationsEnabled let triggerAutomationRunEnabled = $licensing.triggerAutomationRunEnabled
let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK] let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
let selectedAction let selectedAction
let actionVal let actionVal
@ -38,8 +38,8 @@
disabled: !lastStep || !syncAutomationsEnabled || collectBlockExists, disabled: !lastStep || !syncAutomationsEnabled || collectBlockExists,
message: collectDisabledMessage(), message: collectDisabledMessage(),
}, },
TRIGGER: { TRIGGER_AUTOMATION_RUN: {
disabled: !triggerAutomationsEnabled, disabled: !triggerAutomationRunEnabled,
message: collectDisabledMessage(), message: collectDisabledMessage(),
}, },
} }
@ -155,7 +155,7 @@
<div class="item-body"> <div class="item-body">
<Icon name={action.icon} /> <Icon name={action.icon} />
<Body size="XS">{action.name}</Body> <Body size="XS">{action.name}</Body>
{#if isDisabled && !syncAutomationsEnabled && !triggerAutomationsEnabled && lockedFeatures.includes(action.stepId)} {#if isDisabled && !syncAutomationsEnabled && !triggerAutomationRunEnabled && lockedFeatures.includes(action.stepId)}
<div class="tag-color"> <div class="tag-color">
<Tags> <Tags>
<Tag icon="LockClosed">Premium</Tag> <Tag icon="LockClosed">Premium</Tag>

2
packages/builder/src/constants/backend/automations.js
View File

@ -21,7 +21,7 @@ export const ActionStepID = {
QUERY_ROWS: "QUERY_ROWS", QUERY_ROWS: "QUERY_ROWS",
LOOP: "LOOP", LOOP: "LOOP",
COLLECT: "COLLECT", COLLECT: "COLLECT",
TRIGGER: "TRIGGER", TRIGGER_AUTOMATION_RUN: "TRIGGER_AUTOMATION_RUN",
// these used to be lowercase step IDs, maintain for backwards compat // these used to be lowercase step IDs, maintain for backwards compat
discord: "discord", discord: "discord",
slack: "slack", slack: "slack",

6
packages/builder/src/stores/portal/licensing.js
View File

@ -125,8 +125,8 @@ export const createLicensingStore = () => {
const syncAutomationsEnabled = license.features.includes( const syncAutomationsEnabled = license.features.includes(
Constants.Features.SYNC_AUTOMATIONS Constants.Features.SYNC_AUTOMATIONS
) )
const triggerAutomationsEnabled = license.features.includes( const triggerAutomationRunEnabled = license.features.includes(
Constants.Features.SYNC_AUTOMATIONS Constants.Features.TRIGGER_AUTOMATION_RUN
) )
const perAppBuildersEnabled = license.features.includes( const perAppBuildersEnabled = license.features.includes(
@ -151,7 +151,7 @@ export const createLicensingStore = () => {
auditLogsEnabled, auditLogsEnabled,
enforceableSSO, enforceableSSO,
syncAutomationsEnabled, syncAutomationsEnabled,
triggerAutomationsEnabled, triggerAutomationRunEnabled,
isViewPermissionsEnabled, isViewPermissionsEnabled,
perAppBuildersEnabled, perAppBuildersEnabled,
} }

6
packages/server/src/automations/actions.ts
View File

@ -15,7 +15,7 @@ import * as delay from "./steps/delay"
import * as queryRow from "./steps/queryRows" import * as queryRow from "./steps/queryRows"
import * as loop from "./steps/loop" import * as loop from "./steps/loop"
import * as collect from "./steps/collect" import * as collect from "./steps/collect"
import * as trigger from "./steps/trigger" import * as triggerAutomationRun from "./steps/triggerAutomationRun"
import env from "../environment" import env from "../environment"
import { import {
AutomationStepSchema, AutomationStepSchema,
@ -42,7 +42,7 @@ const ACTION_IMPLS: Record<
FILTER: filter.run, FILTER: filter.run,
QUERY_ROWS: queryRow.run, QUERY_ROWS: queryRow.run,
COLLECT: collect.run, COLLECT: collect.run,
TRIGGER: trigger.run, TRIGGER: triggerAutomationRun.run,
// these used to be lowercase step IDs, maintain for backwards compat // these used to be lowercase step IDs, maintain for backwards compat
discord: discord.run, discord: discord.run,
slack: slack.run, slack: slack.run,
@ -64,7 +64,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record<string, AutomationStepSchema> =
QUERY_ROWS: queryRow.definition, QUERY_ROWS: queryRow.definition,
LOOP: loop.definition, LOOP: loop.definition,
COLLECT: collect.definition, COLLECT: collect.definition,
TRIGGER: trigger.definition, TRIGGER: triggerAutomationRun.definition,
// these used to be lowercase step IDs, maintain for backwards compat // these used to be lowercase step IDs, maintain for backwards compat
discord: discord.definition, discord: discord.definition,
slack: slack.definition, slack: slack.definition,

2
packages/server/src/automations/steps/triggerAutomationRun.ts
View File

@ -12,7 +12,7 @@ import * as triggers from "../triggers"
import { db as dbCore, context } from "@budibase/backend-core" import { db as dbCore, context } from "@budibase/backend-core"
export const definition: AutomationStepSchema = { export const definition: AutomationStepSchema = {
name: "Trigger Automation", name: "Trigger an automation",
tagline: "Triggers an automation synchronously", tagline: "Triggers an automation synchronously",
icon: "Sync", icon: "Sync",
description: "Triggers an automation synchronously", description: "Triggers an automation synchronously",

2
packages/types/src/sdk/licensing/feature.ts
View File

@ -9,7 +9,7 @@ export enum Feature {
BRANDING = "branding", BRANDING = "branding",
SCIM = "scim", SCIM = "scim",
SYNC_AUTOMATIONS = "syncAutomations", SYNC_AUTOMATIONS = "syncAutomations",
TRIGGER_AUTOMATION = "triggerAutomation", TRIGGER_AUTOMATION_RUN = "triggerAutomationRun",
APP_BUILDERS = "appBuilders", APP_BUILDERS = "appBuilders",
OFFLINE = "offline", OFFLINE = "offline",
EXPANDED_PUBLIC_API = "expandedPublicApi", EXPANDED_PUBLIC_API = "expandedPublicApi",