Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

feat: improve template version select ux#20347

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.

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

Already on GitHub?Sign in to your account

Merged
BrunoQuaresma merged 2 commits intomainfrombq/improve-version-picker-ux
Oct 17, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
8 changes: 5 additions & 3 deletionssite/src/components/Select/Select.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,13 @@ export const SelectGroup = SelectPrimitive.Group;

export const SelectValue = SelectPrimitive.Value;

export type SelectTriggerProps = React.ComponentPropsWithoutRef<
typeof SelectPrimitive.Trigger
>;

export const SelectTrigger = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {
id?: string;
}
SelectTriggerProps
>(({ className, children, id, ...props }, ref) => (
<SelectPrimitive.Trigger
ref={ref}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import type { Meta, StoryObj } from "@storybook/react-vite";
import { Select, SelectContent, SelectItem } from "components/Select/Select";
import { userEvent, within } from "storybook/test";
import { PromptSelectTrigger } from "./PromptSelectTrigger";

const meta: Meta<typeof PromptSelectTrigger> = {
title: "modules/tasks/TaskPrompt/PromptSelectTrigger",
component: PromptSelectTrigger,
args: {
children: "Select a version",
tooltip: "Template version",
},
render: (args) => (
<Select>
<PromptSelectTrigger {...args} />
<SelectContent>
<SelectItem value="version-1">Version 1</SelectItem>
<SelectItem value="version-2">Version 2</SelectItem>
<SelectItem value="version-3">Version 3</SelectItem>
</SelectContent>
</Select>
),
};

export default meta;
type Story = StoryObj<typeof PromptSelectTrigger>;

export const Closed: Story = {};

export const Open: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const trigger = canvas.getByRole("combobox");
await userEvent.click(trigger);
},
};
41 changes: 41 additions & 0 deletionssite/src/modules/tasks/TaskPrompt/PromptSelectTrigger.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import {
SelectTrigger,
type SelectTriggerProps,
} from "components/Select/Select";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "components/Tooltip/Tooltip";
import type { FC } from "react";
import { cn } from "utils/cn";

type PromptSelectTriggerProps = SelectTriggerProps & {
tooltip: string;
};

export const PromptSelectTrigger: FC<PromptSelectTriggerProps> = ({
className,
tooltip,
...props
}) => {
return (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<SelectTrigger
{...props}
className={cn([
className,
`w-auto border-0 bg-surface-secondary text-sm text-content-primary gap-2 px-3
[&_svg]:text-inherit cursor-pointer hover:bg-surface-quaternary rounded-full
h-8 data-[state=open]:bg-surface-tertiary`,
])}
/>
</TooltipTrigger>
<TooltipContent>{tooltip}</TooltipContent>
</Tooltip>
</TooltipProvider>
);
};
60 changes: 11 additions & 49 deletionssite/src/modules/tasks/TaskPrompt/TaskPrompt.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
import type { SelectTriggerProps } from "@radix-ui/react-select";
import { API } from "api/api";
import { getErrorDetail, getErrorMessage } from "api/errors";
import {
templateVersionPresets,
templateVersions,
} from "api/queries/templates";
import { templateVersionPresets } from "api/queries/templates";
import type {
Preset,
Task,
Expand All@@ -20,7 +16,6 @@ import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "components/Select/Select";
import { Skeleton } from "components/Skeleton/Skeleton";
Expand All@@ -40,8 +35,9 @@ import { useMutation, useQuery, useQueryClient } from "react-query";
import TextareaAutosize, {
type TextareaAutosizeProps,
} from "react-textarea-autosize";
import { cn } from "utils/cn";
import { docs } from "utils/docs";
import { PromptSelectTrigger } from "./PromptSelectTrigger";
import { TemplateVersionSelect } from "./TemplateVersionSelect";

type TaskPromptProps = {
templates: Template[] | undefined;
Expand DownExpand Up@@ -154,10 +150,6 @@ const CreateTaskForm: FC<CreateTaskFormProps> = ({ templates, onSuccess }) => {
const [selectedVersionId, setSelectedVersionId] = useState(
selectedTemplate.active_version_id,
);
const versionsQuery = useQuery({
...templateVersions(selectedTemplate.id),
enabled: permissions.updateTemplates,
});
useEffect(() => {
setSelectedVersionId(selectedTemplate.active_version_id);
}, [selectedTemplate]);
Expand DownExpand Up@@ -279,7 +271,7 @@ const CreateTaskForm: FC<CreateTaskFormProps> = ({ templates, onSuccess }) => {
defaultValue={templates[0].id}
required
>
<PromptSelectTrigger id="templateID">
<PromptSelectTrigger id="templateID" tooltip="Template">
<SelectValue placeholder="Select a template" />
</PromptSelectTrigger>
<SelectContent>
Expand All@@ -296,30 +288,17 @@ const CreateTaskForm: FC<CreateTaskFormProps> = ({ templates, onSuccess }) => {
</Select>
</div>

{versionsQuery.data && (
{permissions.updateTemplates && (
<div>
<label htmlFor="versionId" className="sr-only">
Template version
</label>
<Select
name="versionId"
onValueChange={(value) => setSelectedVersionId(value)}
<TemplateVersionSelect
templateId={selectedTemplateId}
activeVersionId={selectedTemplate.active_version_id}
value={selectedVersionId}
required
>
<PromptSelectTrigger id="versionId">
<SelectValue placeholder="Select a version" />
</PromptSelectTrigger>
<SelectContent>
{versionsQuery.data.map((version) => {
return (
<SelectItem value={version.id} key={version.id}>
{version.name}
</SelectItem>
);
})}
</SelectContent>
</Select>
onValueChange={setSelectedVersionId}
/>
</div>
)}

Expand All@@ -339,7 +318,7 @@ const CreateTaskForm: FC<CreateTaskFormProps> = ({ templates, onSuccess }) => {
value={selectedPresetId}
onValueChange={setSelectedPresetId}
>
<PromptSelectTrigger id="presetID">
<PromptSelectTrigger id="presetID" tooltip="Preset">
<SelectValue placeholder="Select a preset" />
</PromptSelectTrigger>
<SelectContent>
Expand DownExpand Up@@ -389,23 +368,6 @@ const CreateTaskForm: FC<CreateTaskFormProps> = ({ templates, onSuccess }) => {
);
};

const PromptSelectTrigger: FC<SelectTriggerProps> = ({
className,
...props
}) => {
return (
<SelectTrigger
{...props}
className={cn([
className,
`border-0 bg-surface-secondary text-sm text-content-primary gap-2 px-3
[&_svg]:text-inherit cursor-pointer hover:bg-surface-quaternary rounded-full
h-8 data-[state=open]:bg-surface-tertiary`,
])}
/>
);
};

type ExternalAuthButtonProps = {
versionId: string;
missedExternalAuth: TemplateVersionExternalAuth[];
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { MockTemplate, MockTemplateVersion } from "testHelpers/entities";
import type { Meta, StoryObj } from "@storybook/react-vite";
import { API } from "api/api";
import { useState } from "react";
import { spyOn, userEvent, within } from "storybook/test";
import { daysAgo } from "utils/time";
import { TemplateVersionSelect } from "./TemplateVersionSelect";

const meta: Meta<typeof TemplateVersionSelect> = {
title: "modules/tasks/TaskPrompt/TemplateVersionSelect",
component: TemplateVersionSelect,
args: {
activeVersionId: MockTemplateVersion.id,
templateId: MockTemplate.id,
value: MockTemplateVersion.id,
},
render: ({ value: defaultValue, ...args }) => {
const [value, setValue] = useState(defaultValue);
return (
<TemplateVersionSelect {...args} value={value} onValueChange={setValue} />
);
},
};

export default meta;
type Story = StoryObj<typeof TemplateVersionSelect>;

const MockVersions = [
{
...MockTemplateVersion,
id: "v1.0.0",
name: "v1.0.0",
created_at: daysAgo(3),
},
{
...MockTemplateVersion,
id: "v2.0.0",
name: "v2.0.0",
created_at: daysAgo(2),
},
{
...MockTemplateVersion,
id: "v3.0.0",
name: "v3.0.0",
created_at: daysAgo(1),
},
];

export const Loading: Story = {
beforeEach: () => {
spyOn(API, "getTemplateVersions").mockImplementation(() => {
return new Promise(() => {});
});
},
};

export const Loaded: Story = {
args: {
activeVersionId: MockVersions[2].id,
value: MockVersions[2].id,
},
beforeEach: () => {
spyOn(API, "getTemplateVersions").mockResolvedValue(MockVersions);
},
};

export const Open: Story = {
args: {
activeVersionId: MockVersions[2].id,
value: MockVersions[2].id,
},
beforeEach: () => {
spyOn(API, "getTemplateVersions").mockResolvedValue(MockVersions);
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const trigger = await canvas.findByRole("combobox");
await userEvent.click(trigger);
},
};
65 changes: 65 additions & 0 deletionssite/src/modules/tasks/TaskPrompt/TemplateVersionSelect.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import { templateVersions } from "api/queries/templates";
import { Badge } from "components/Badge/Badge";
import {
Select,
SelectContent,
SelectItem,
SelectValue,
} from "components/Select/Select";
import { Skeleton } from "components/Skeleton/Skeleton";
import type { FC } from "react";
import { useQuery } from "react-query";
import { PromptSelectTrigger } from "./PromptSelectTrigger";

type TemplateVersionSelectProps = {
value: string;
templateId: string;
activeVersionId: string;
onValueChange: (value: string) => void;
};

export const TemplateVersionSelect: FC<TemplateVersionSelectProps> = ({
templateId,
activeVersionId,
...props
}) => {
const { data: versions } = useQuery({
...templateVersions(templateId),
select: (versions) =>
versions
.filter((v) => !v.archived)
.toSorted((a, b) => {
return (
new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
);
}),
Comment on lines +31 to +35
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we know if all of our customers can use this yet? I knowtoSorted broke a deployment for a customer in the past year or so because they hadn't upgraded their browser in a really long time

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

It started being supported by browsers at the beginning of 2023, so I think we’re good. We don’t have a strict rule for that, but using APIs that have been available for more than two years should be safe enough.

});

if (!versions) {
return <Skeleton className="w-28 h-8 rounded-full" />;
}

return (
<Select name="versionId" {...props}>
<PromptSelectTrigger id="versionId" tooltip="Template version">
<SelectValue placeholder="Select a version" />
</PromptSelectTrigger>
<SelectContent>
{versions.map((version) => {
return (
<SelectItem value={version.id} key={version.id}>
<span className="flex items-center gap-2">
{version.name}
{activeVersionId === version.id && (
<Badge size="xs" variant="green">
Active
</Badge>
)}
</span>
</SelectItem>
);
})}
</SelectContent>
</Select>
);
};
Loading
[8]ページ先頭
©2009-2025 Movatter.jp