Skip to content

[Improve] Keep custom automation controls available during run now #1116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brunobergher merged 2 commits into from
Aug 5, 2026
Merged

[Improve] Keep custom automation controls available during run now #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26fa9dd
improve: unblock concurrent custom automation runs
roomote Aug 5, 2026
6586138
Merge remote-tracking branch 'origin/develop' into feature/custom-aut…
roomote Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 72 additions & 6 deletions apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/web/src/components/settings/automations/AutomationsSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,9 +1800,9 @@ export function AutomationsSettings() {

switch (data.outcome) {
case 'launched':
toast.success(`${automationLabel} started a task.`, {
toast.success(`Running ${automationLabel} now`, {
action: {
label: 'Open task',
label: 'View task',
onClick: () => window.open(`/task/${data.taskId}`, '_blank'),
},
});
Expand Down
104 changes: 61 additions & 43 deletions apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,62 @@ function cadenceLabel(row: CustomAutomationListItem): string {
: 'Custom schedule';
}

function CustomAutomationRunButton({
automation,
disabled,
}: {
automation: CustomAutomationListItem;
disabled: boolean;
}) {
const trpc = useTRPC();
const triggerMutation = useMutation({
...trpc.automations.triggerCustomAutomation.mutationOptions({
onSuccess: (result) => {
switch (result.outcome) {
case 'launched':
toast.success(`Running ${automation.name} now`, {
action: {
label: 'View task',
onClick: () => window.open(`/task/${result.taskId}`, '_blank'),
},
});
break;
case 'completed':
toast.success(`${automation.name} ran successfully.`);
break;
case 'skipped':
toast.info(
`${automation.name} had nothing to do: ${result.reason}`,
);
break;
case 'failed':
toast.error(`${automation.name} failed: ${result.error}`);
break;
}
},
onError: (error) => {
toast.error(error.message || `Failed to run ${automation.name}`);
},
}),
mutationKey: ['customAutomationRun', automation.id],
});

return (
<BasicTooltip content="Run now">
<Button
type="button"
size="icon"
variant="ghost"
disabled={disabled || triggerMutation.isPending || !automation.enabled}
aria-label={`Run ${automation.name} now`}
onClick={() => triggerMutation.mutate({ id: automation.id })}
>
<Play />
</Button>
</BasicTooltip>
);
}

function targetFromRow(row: CustomAutomationListItem): {
provider: CustomAutomationFormState['targetProvider'];
channelId: string;
Expand Down Expand Up @@ -350,35 +406,6 @@ export function CustomAutomationsSection() {
}),
);

const triggerMutation = useMutation(
trpc.automations.triggerCustomAutomation.mutationOptions({
onSuccess: (result) => {
switch (result.outcome) {
case 'launched':
toast.success('Custom automation started a task.', {
action: {
label: 'Open task',
onClick: () => window.open(`/task/${result.taskId}`, '_blank'),
},
});
break;
case 'completed':
toast.success('Custom automation ran successfully.');
break;
case 'skipped':
toast.info(`Custom automation had nothing to do: ${result.reason}`);
break;
case 'failed':
toast.error(`Custom automation failed: ${result.error}`);
break;
}
},
onError: (error) => {
toast.error(error.message || 'Failed to run custom automation');
},
}),
);

const resolveScheduleMutation = useMutation(
trpc.automations.resolveCustomAutomationSchedule.mutationOptions({
onSuccess: (result, variables) => {
Expand Down Expand Up @@ -431,8 +458,7 @@ export function CustomAutomationsSection() {
createMutation.isPending ||
updateMutation.isPending ||
deleteMutation.isPending ||
toggleMutation.isPending ||
triggerMutation.isPending;
toggleMutation.isPending;

const closeEditor = () => {
setIsCreating(false);
Expand Down Expand Up @@ -1062,18 +1088,10 @@ export function CustomAutomationsSection() {
</p>
</div>
<div className="col-start-2 row-start-2 flex shrink-0 items-center gap-1 sm:col-start-3 sm:row-start-1">
<BasicTooltip content="Run now">
<Button
type="button"
size="icon"
variant="ghost"
disabled={busy || !row.enabled}
aria-label={`Run ${row.name} now`}
onClick={() => triggerMutation.mutate({ id: row.id })}
>
<Play />
</Button>
</BasicTooltip>
<CustomAutomationRunButton
automation={row}
disabled={busy}
/>
<BasicTooltip content="Configure">
<Button
type="button"
Expand Down
Loading