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
Merged

feat: add preset selector in TasksPage #19012

Show file tree
Hide file tree
Changes from all commits
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
145 changes: 89 additions & 56 deletions site/src/pages/TasksPage/TasksPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import { API } from "api/api";
import { MockUsers } from "pages/UsersPage/storybookData/users";
import { reactRouterParameters } from "storybook-addon-remix-react-router";
import {
MockAIPromptPresets,
MockNewTaskData,
MockPresets,
MockTasks,
MockTemplate,
MockTemplateVersionExternalAuthGithub,
MockTemplateVersionExternalAuthGithubAuthenticated,
MockUserOwner,
MockWorkspace,
MockWorkspaceAppStatus,
mockApiError,
} from "testHelpers/entities";
import {
Expand All @@ -31,6 +33,7 @@ const meta: Meta<typeof TasksPage> = {
},
beforeEach: () => {
spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([]);
spyOn(API, "getTemplateVersionPresets").mockResolvedValue(null);
spyOn(API, "getUsers").mockResolvedValue({
users: MockUsers,
count: MockUsers.length,
Expand All @@ -53,7 +56,7 @@ type Story = StoryObj<typeof TasksPage>;
export const LoadingAITemplates: Story = {
beforeEach: () => {
spyOn(data, "fetchAITemplates").mockImplementation(
() => new Promise((res) => 1000 * 60 * 60),
() => new Promise(() => 1000 * 60 * 60),
);
},
};
Expand All @@ -79,7 +82,7 @@ export const LoadingTasks: Story = {
beforeEach: () => {
spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
spyOn(data, "fetchTasks").mockImplementation(
() => new Promise((res) => 1000 * 60 * 60),
() => new Promise(() => 1000 * 60 * 60),
);
},
play: async ({ canvasElement, step }) => {
Expand Down Expand Up @@ -119,15 +122,77 @@ export const LoadedTasks: Story = {
},
};

const newTaskData = {
prompt: "Create a new task",
workspace: {
...MockWorkspace,
id: "workspace-4",
latest_app_status: {
...MockWorkspaceAppStatus,
message: "Task created successfully!",
},
export const LoadedTasksWithPresets: Story = {
decorators: [withProxyProvider()],
beforeEach: () => {
const mockTemplateWithPresets = {
...MockTemplate,
id: "test-template-2",
name: "template-with-presets",
display_name: "Template with Presets",
};

spyOn(data, "fetchAITemplates").mockResolvedValue([
MockTemplate,
mockTemplateWithPresets,
]);
spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);
spyOn(API, "getTemplateVersionPresets").mockImplementation(
async (versionId) => {
// Return presets only for the second template
if (versionId === mockTemplateWithPresets.active_version_id) {
return MockPresets;
}
return null;
},
);
},
};

export const LoadedTasksWithAIPromptPresets: Story = {
decorators: [withProxyProvider()],
beforeEach: () => {
const mockTemplateWithPresets = {
...MockTemplate,
id: "test-template-2",
name: "template-with-presets",
display_name: "Template with AI Prompt Presets",
};

spyOn(data, "fetchAITemplates").mockResolvedValue([
MockTemplate,
mockTemplateWithPresets,
]);
spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);
spyOn(API, "getTemplateVersionPresets").mockImplementation(
async (versionId) => {
// Return presets only for the second template
if (versionId === mockTemplateWithPresets.active_version_id) {
return MockAIPromptPresets;
}
return null;
},
);
},
};

export const LoadedTasksEdgeCases: Story = {
decorators: [withProxyProvider()],
beforeEach: () => {
spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);

// Test various edge cases for presets
spyOn(API, "getTemplateVersionPresets").mockImplementation(async () => {
return [
{
ID: "malformed",
Name: "Malformed Preset",
Default: true,
},
// biome-ignore lint/suspicious/noExplicitAny: Testing malformed data edge cases
] as any;
});
},
};

Expand All @@ -154,15 +219,15 @@ export const CreateTaskSuccessfully: Story = {
spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
spyOn(data, "fetchTasks")
.mockResolvedValueOnce(MockTasks)
.mockResolvedValue([newTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(newTaskData);
.mockResolvedValue([MockNewTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
},
play: async ({ canvasElement, step }) => {
const canvas = within(canvasElement);

await step("Run task", async () => {
const prompt = await canvas.findByLabelText(/prompt/i);
await userEvent.type(prompt, newTaskData.prompt);
await userEvent.type(prompt, MockNewTaskData.prompt);
const submitButton = canvas.getByRole("button", { name: /run task/i });
await waitFor(() => expect(submitButton).toBeEnabled());
await userEvent.click(submitButton);
Expand Down Expand Up @@ -208,8 +273,8 @@ export const WithAuthenticatedExternalAuth: Story = {
beforeEach: () => {
spyOn(data, "fetchTasks")
.mockResolvedValueOnce(MockTasks)
.mockResolvedValue([newTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(newTaskData);
.mockResolvedValue([MockNewTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([
MockTemplateVersionExternalAuthGithubAuthenticated,
]);
Expand All @@ -235,8 +300,8 @@ export const MissingExternalAuth: Story = {
beforeEach: () => {
spyOn(data, "fetchTasks")
.mockResolvedValueOnce(MockTasks)
.mockResolvedValue([newTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(newTaskData);
.mockResolvedValue([MockNewTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([
MockTemplateVersionExternalAuthGithub,
]);
Expand All @@ -246,7 +311,7 @@ export const MissingExternalAuth: Story = {

await step("Submit is disabled", async () => {
const prompt = await canvas.findByLabelText(/prompt/i);
await userEvent.type(prompt, newTaskData.prompt);
await userEvent.type(prompt, MockNewTaskData.prompt);
const submitButton = canvas.getByRole("button", { name: /run task/i });
expect(submitButton).toBeDisabled();
});
Expand All @@ -262,8 +327,8 @@ export const ExternalAuthError: Story = {
beforeEach: () => {
spyOn(data, "fetchTasks")
.mockResolvedValueOnce(MockTasks)
.mockResolvedValue([newTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(newTaskData);
.mockResolvedValue([MockNewTaskData, ...MockTasks]);
spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
spyOn(API, "getTemplateVersionExternalAuth").mockRejectedValue(
mockApiError({
message: "Failed to load external auth",
Expand All @@ -275,7 +340,7 @@ export const ExternalAuthError: Story = {

await step("Submit is disabled", async () => {
const prompt = await canvas.findByLabelText(/prompt/i);
await userEvent.type(prompt, newTaskData.prompt);
await userEvent.type(prompt, MockNewTaskData.prompt);
const submitButton = canvas.getByRole("button", { name: /run task/i });
expect(submitButton).toBeDisabled();
});
Expand Down Expand Up @@ -308,35 +373,3 @@ export const NonAdmin: Story = {
});
},
};

const MockTasks = [
{
workspace: {
...MockWorkspace,
latest_app_status: MockWorkspaceAppStatus,
},
prompt: "Create competitors page",
},
{
workspace: {
...MockWorkspace,
id: "workspace-2",
latest_app_status: {
...MockWorkspaceAppStatus,
message: "Avatar size fixed!",
},
},
prompt: "Fix user avatar size",
},
{
workspace: {
...MockWorkspace,
id: "workspace-3",
latest_app_status: {
...MockWorkspaceAppStatus,
message: "Accessibility issues fixed!",
},
},
prompt: "Fix accessibility issues",
},
];
Comment on lines -312 to -342
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review: moved to entities.ts

Loading
Loading