Skip to content

feat: add preset selector in TasksPage #19012

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
merged 17 commits into from
Jul 24, 2025
+364 −89
Merged

feat: add preset selector in TasksPage #19012

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a4ccb41
feat: add preset selector in TasksPage
johnstcn Jul 23, 2025
8cafbc9
sort presets with default at top
johnstcn Jul 24, 2025
071c896
add labels for template and preset selectors
johnstcn Jul 24, 2025
9938038
increase template and preset select width
johnstcn Jul 24, 2025
ec3d72d
override ai prompt with preset if defined
johnstcn Jul 24, 2025
31901f9
hide presets selector if no presets exist for template
johnstcn Jul 24, 2025
c4dbd2f
fix ai prompt parameter name
johnstcn Jul 24, 2025
72db7b6
update storybook
johnstcn Jul 24, 2025
4f2d820
address copilot comments
johnstcn Jul 24, 2025
7602ef6
address code review comments
johnstcn Jul 24, 2025
80b96de
fix crash if presets is null
johnstcn Jul 24, 2025
e248c14
adjust label styling
johnstcn Jul 24, 2025
bf6f113
correctly handle selecting default preset on presetData change
johnstcn Jul 24, 2025
b3916e2
DesiredPrebuildInstances
johnstcn Jul 24, 2025
0fd55e2
add label to indicate if prompt is defined by preset
johnstcn Jul 24, 2025
9da9f5d
use preexisting query
johnstcn Jul 24, 2025
2680111
keep form label around
johnstcn Jul 24, 2025
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
Next Next commit
feat: add preset selector in TasksPage
  • Loading branch information
@johnstcn
johnstcn committed Jul 24, 2025
commit a4ccb41e7e6a0717fabe88b78ee4f4c67b267523
120 changes: 92 additions & 28 deletions site/src/pages/TasksPage/TasksPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import Skeleton from "@mui/material/Skeleton";
import { API } from "api/api";
import { getErrorDetail, getErrorMessage } from "api/errors";
import { disabledRefetchOptions } from "api/queries/util";
import type { Template, TemplateVersionExternalAuth } from "api/typesGenerated";
import type {
Preset,
Template,
TemplateVersionExternalAuth,
} from "api/typesGenerated";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Avatar } from "components/Avatar/Avatar";
import { AvatarData } from "components/Avatar/AvatarData";
Expand Down Expand Up @@ -50,7 +54,7 @@ import { RedoIcon, RotateCcwIcon, SendIcon } from "lucide-react";
import { AI_PROMPT_PARAMETER_NAME, type Task } from "modules/tasks/tasks";
import { WorkspaceAppStatus } from "modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus";
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
import { type FC, type ReactNode, useState } from "react";
import { type FC, type ReactNode, useEffect, useState } from "react";
import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { Link as RouterLink, useNavigate } from "react-router-dom";
Expand Down Expand Up @@ -210,7 +214,11 @@ const TaskFormSection: FC<{
);
};

type CreateTaskMutationFnProps = { prompt: string; templateVersionId: string };
type CreateTaskMutationFnProps = {
prompt: string;
templateVersionId: string;
presetId: string | null;
};

type TaskFormProps = {
templates: Template[];
Expand All @@ -223,6 +231,8 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
const [selectedTemplateId, setSelectedTemplateId] = useState<string>(
templates[0].id,
);
const [presets, setPresets] = useState<Preset[] | null>(null);
const [selectedPresetId, setSelectedPresetId] = useState<string | null>(null);
const selectedTemplate = templates.find(
(t) => t.id === selectedTemplateId,
) as Template;
Expand All @@ -232,6 +242,28 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
isPollingExternalAuth,
isLoadingExternalAuth,
} = useExternalAuth(selectedTemplate.active_version_id);

// Fetch presets when template changes
const { data: presetsData } = useQuery<Preset[] | null, Error>({
queryKey: ["template-version-presets", selectedTemplate.active_version_id],
queryFn: () =>
API.getTemplateVersionPresets(selectedTemplate.active_version_id),
...disabledRefetchOptions,
});

// Handle preset data changes
useEffect(() => {
if (presetsData) {
setPresets(presetsData);
// Set default preset if available
const defaultPreset = presetsData.find((p: Preset) => p.Default);
if (defaultPreset) {
setSelectedPresetId(defaultPreset.ID);
} else {
setSelectedPresetId(null);
}
}
}, [presetsData]);
const missedExternalAuth = externalAuth?.filter(
(auth) => !auth.optional && !auth.authenticated,
);
Expand All @@ -243,8 +275,9 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
mutationFn: async ({
prompt,
templateVersionId,
presetId,
}: CreateTaskMutationFnProps) =>
data.createTask(prompt, user.id, templateVersionId),
data.createTask(prompt, user.id, templateVersionId, presetId),
onSuccess: async (task) => {
await queryClient.invalidateQueries({
queryKey: ["tasks"],
Expand All @@ -265,6 +298,7 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
await createTaskMutation.mutateAsync({
prompt,
templateVersionId: selectedTemplate.active_version_id,
presetId: selectedPresetId,
});
} catch (error) {
const message = getErrorMessage(error, "Error creating task");
Expand Down Expand Up @@ -297,27 +331,50 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
text-sm shadow-sm text-content-primary placeholder:text-content-secondary md:text-sm`}
/>
<div className="flex items-center justify-between pt-2">
<Select
name="templateID"
onValueChange={(value) => setSelectedTemplateId(value)}
defaultValue={templates[0].id}
required
>
<SelectTrigger className="w-52 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3">
<SelectValue placeholder="Select a template" />
</SelectTrigger>
<SelectContent>
{templates.map((template) => {
return (
<SelectItem value={template.id} key={template.id}>
<span className="overflow-hidden text-ellipsis block">
{template.display_name || template.name}
</span>
</SelectItem>
);
})}
</SelectContent>
</Select>
<div className="flex items-center gap-2">
<Select
name="templateID"
onValueChange={(value) => setSelectedTemplateId(value)}
defaultValue={templates[0].id}
required
>
<SelectTrigger className="w-40 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3">
<SelectValue placeholder="Select a template" />
</SelectTrigger>
<SelectContent>
{templates.map((template) => {
return (
<SelectItem value={template.id} key={template.id}>
<span className="overflow-hidden text-ellipsis block">
{template.display_name || template.name}
</span>
</SelectItem>
);
})}
</SelectContent>
</Select>

{presets && presets.length > 0 && (
<Select
name="presetID"
value={selectedPresetId === null ? undefined : selectedPresetId}
onValueChange={(value) => setSelectedPresetId(value)}
>
<SelectTrigger className="w-40 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3">
<SelectValue placeholder="Select a preset" />
</SelectTrigger>
<SelectContent>
{presets.map((preset) => (
<SelectItem value={preset.ID} key={preset.ID}>
<span className="overflow-hidden text-ellipsis block">
{preset.Name} {preset.Default && "(Default)"}
</span>
</SelectItem>
))}
</SelectContent>
</Select>
)}
</div>

<div className="flex items-center gap-2">
{missedExternalAuth && (
Expand Down Expand Up @@ -608,13 +665,20 @@ export const data = {
prompt: string,
userId: string,
templateVersionId: string,
presetId: string | null = null,
): Promise<Task> {
const presets = await API.getTemplateVersionPresets(templateVersionId);
const defaultPreset = presets?.find((p) => p.Default);
// If no preset is selected, get the default preset
let preset_id: string | undefined = presetId || undefined;
if (!preset_id) {
const presets = await API.getTemplateVersionPresets(templateVersionId);
const defaultPreset = presets?.find((p) => p.Default);
preset_id = defaultPreset?.ID;
}

const workspace = await API.createWorkspace(userId, {
name: `task-${generateWorkspaceName()}`,
template_version_id: templateVersionId,
template_version_preset_id: defaultPreset?.ID,
template_version_preset_id: preset_id || undefined,
rich_parameter_values: [
{ name: AI_PROMPT_PARAMETER_NAME, value: prompt },
],
Expand Down