Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

fix(flows): the trigger icon tooltip says what the schedule means (#16571)

Abdulcba520daeb47
diff --git a/packages/core/execution/package.json b/packages/core/execution/package.json
index 098e7e6bd95..535cc909247 100644
--- a/packages/core/execution/package.json
+++ b/packages/core/execution/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/core-execution",
- "version": "0.26.3",
+ "version": "0.26.4",
"type": "commonjs",
"main": "./dist/src/index.js",
"scripts": {
diff --git a/packages/core/execution/src/lib/flows/dto/list-flows-request.ts b/packages/core/execution/src/lib/flows/dto/list-flows-request.ts
index 3f45e488b53..ed4b89f34d4 100755
--- a/packages/core/execution/src/lib/flows/dto/list-flows-request.ts
+++ b/packages/core/execution/src/lib/flows/dto/list-flows-request.ts
@@ -9,11 +9,11 @@ export const ListFlowsRequest = z.object({
folderIds: OptionalArrayFromQuery(z.string()),
limit: z.coerce.number().optional(),
cursor: z.string().optional(),
- status: OptionalArrayFromQuery(z.nativeEnum(FlowStatus)),
+ status: OptionalArrayFromQuery(z.enum(FlowStatus)),
projectId: z.string(),
name: z.string().optional(),
agentExternalIds: OptionalArrayFromQuery(z.string()),
- versionState: z.nativeEnum(FlowVersionState).optional(),
+ versionState: z.enum(FlowVersionState).optional(),
connectionExternalIds: OptionalArrayFromQuery(z.string()),
externalIds: OptionalArrayFromQuery(z.string()),
sortBy: z.enum(['NAME']).optional(),
diff --git a/packages/core/execution/src/lib/flows/flow.ts b/packages/core/execution/src/lib/flows/flow.ts
index c1055d5d5b8..3dc4444bce7 100755
--- a/packages/core/execution/src/lib/flows/flow.ts
+++ b/packages/core/execution/src/lib/flows/flow.ts
@@ -62,7 +62,7 @@ export const Flow = z.object({
export type Flow = z.infer<typeof Flow>
export const PopulatedFlow = Flow.extend({
version: FlowVersion,
- triggerSource: zMini.optional(zMini.pick(TriggerSource, { schedule: true })),
+ triggerSource: zMini.optional(zMini.partial(zMini.pick(TriggerSource, { schedule: true, pieceName: true }), { pieceName: true })),
})
export type PopulatedFlow = z.infer<typeof PopulatedFlow>
diff --git a/packages/server/api/src/app/ee/projects/project-release/project-state/project-state.service.ts b/packages/server/api/src/app/ee/projects/project-release/project-state/project-state.service.ts
index 565d64b5cd4..ddf7fbb8417 100644
--- a/packages/server/api/src/app/ee/projects/project-release/project-state/project-state.service.ts
+++ b/packages/server/api/src/app/ee/projects/project-release/project-state/project-state.service.ts
@@ -205,6 +205,7 @@ export const projectStateService = (log: FastifyBaseLogger) => ({
version: flowVersionMap.get(flow.id)!,
triggerSource: triggerSource ? {
schedule: triggerSource.schedule,
+ pieceName: triggerSource.pieceName,
} : undefined,
}
})
diff --git a/packages/server/api/src/app/flows/flow/flow.service.ts b/packages/server/api/src/app/flows/flow/flow.service.ts
index ea09af205f7..88db16f526e 100644
--- a/packages/server/api/src/app/flows/flow/flow.service.ts
+++ b/packages/server/api/src/app/flows/flow/flow.service.ts
@@ -180,7 +180,7 @@ export const flowService = (log: FastifyBaseLogger) => ({
'ff.triggerSource',
'trigger_source',
'ts',
- 'ts."flowId" = ff.id AND ts.deleted IS NULL',
+ 'ts."flowId" = ff.id AND ts.deleted IS NULL AND ts.simulate = false',
)
}
@@ -226,6 +226,7 @@ export const flowService = (log: FastifyBaseLogger) => ({
triggerSource: includeTriggerSource && flow.triggerSource
? {
schedule: flow.triggerSource.schedule,
+ pieceName: flow.triggerSource.pieceName,
}
: undefined,
}
@@ -301,7 +302,7 @@ export const flowService = (log: FastifyBaseLogger) => ({
const triggerSource = await triggerSourceService(log).getByFlowId({
flowId: id,
projectId,
- simulate: undefined,
+ simulate: false,
})
return {
@@ -309,6 +310,7 @@ export const flowService = (log: FastifyBaseLogger) => ({
version: flowVersion,
triggerSource: triggerSource ? {
schedule: triggerSource.schedule,
+ pieceName: triggerSource.pieceName,
} : undefined,
}
},
diff --git a/packages/web/public/locales/en/translation.json b/packages/web/public/locales/en/translation.json
index 226fa21c507..714205feff6 100644
--- a/packages/web/public/locales/en/translation.json
+++ b/packages/web/public/locales/en/translation.json
@@ -3022,8 +3022,11 @@
"You have reached the maximum number of active flows. Disable another flow or increase the limit.": "You have reached the maximum number of active flows. Disable another flow or increase the limit.",
"Flows have been exported.": "Flows have been exported.",
"Failed to export flows": "Failed to export flows",
- "Run every {minutes, plural, =1 {minute} other {# minutes}}": "Run every {minutes, plural, =1 {minute} other {# minutes}}",
- "Real time flow": "Real time flow",
+ "Runs every {minutes, plural, =1 {minute} other {# minutes}}": "Runs every {minutes, plural, =1 {minute} other {# minutes}}",
+ "Checks for new data every {minutes, plural, =1 {minute} other {# minutes}}.": "Checks for new data every {minutes, plural, =1 {minute} other {# minutes}}.",
+ "The flow runs only when there is new data.": "The flow runs only when there is new data.",
+ "Runs as soon as new data arrives": "Runs as soon as new data arrives",
+ "Runs {schedule}": "Runs {schedule}",
"Flow can't be published with empty trigger {name}": "Flow can't be published with empty trigger {name}",
"Please contact support as your published flow has a problem": "Please contact support as your published flow has a problem",
"This field is required": "This field is required",
diff --git a/packages/web/src/features/flows/utils/flows-utils.tsx b/packages/web/src/features/flows/utils/flows-utils.tsx
index 5188ecaa103..ccad3e82698 100644
--- a/packages/web/src/features/flows/utils/flows-utils.tsx
+++ b/packages/web/src/features/flows/utils/flows-utils.tsx
@@ -42,17 +42,32 @@ export const flowsUtils = {
case FlowTriggerType.PIECE: {
const schedule = flow.triggerSource?.schedule;
switch (schedule?.type) {
- case TriggerSourceScheduleType.INTERVAL:
- return t(
- 'Run every {minutes, plural, =1 {minute} other {# minutes}}',
- { minutes: Math.round(schedule.intervalMs / 60_000) },
+ case TriggerSourceScheduleType.INTERVAL: {
+ const minutes = Math.round(schedule.intervalMs / 60_000);
+ return flow.triggerSource?.pieceName ===
+ '@activepieces/piece-schedule' ? (
+ t('Runs every {minutes, plural, =1 {minute} other {# minutes}}', {
+ minutes,
+ })
+ ) : (
+ <>
+ {t(
+ 'Checks for new data every {minutes, plural, =1 {minute} other {# minutes}}.',
+ { minutes },
+ )}
+ <br />
+ {t('The flow runs only when there is new data.')}
+ </>
);
+ }
case TriggerSourceScheduleType.CRON_EXPRESSION:
- return `${t('Run')} ${cronstrue
- .toString(schedule.cronExpression, { locale: 'en' })
- .toLocaleLowerCase()}`;
+ return t('Runs {schedule}', {
+ schedule: cronstrue
+ .toString(schedule.cronExpression, { locale: 'en' })
+ .toLocaleLowerCase(),
+ });
default:
- return t('Real time flow');
+ return t('Runs as soon as new data arrives');
}
}
case FlowTriggerType.EMPTY: