8000 refactor: move required external auth buttons to the submit side by BrunoQuaresma · Pull Request #18586 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

refactor: move required external auth buttons to the submit side #18586

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 6 commits into from
Jun 27, 2025
Merged

refactor: move required external auth buttons to the submit side #18586

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da84dd6
refactor: move required external auth buttons to the submit side
BrunoQuaresma Jun 25, 2025
db8a91b
fmt
BrunoQuaresma Jun 25, 2025
8a12f60
Apply asher's review comments
BrunoQuaresma Jun 26, 2025
a6ff685
Add retry
BrunoQuaresma Jun 26, 2025
2c2be53
fmt
BrunoQuaresma Jun 26, 2025
d294d9b
Apply Asher's comments
BrunoQuaresma Jun 27, 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
129 changes: 73 additions & 56 deletions site/src/pages/TasksPage/TasksPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @ 10000 @ -2,13 +2,12 @@ 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 } from "api/typesGenerated";
import type { Template, TemplateVersionExternalAuth } from "api/typesGenerated";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Avatar } from "components/Avatar/Avatar";
import { AvatarData } from "components/Avatar/AvatarData";
import { AvatarDataSkeleton } from "components/Avatar/AvatarDataSkeleton";
import { Button } from "components/Button/Button";
import { Form, FormFields, FormSection } from "components/Form/Form";
import { displayError } from "components/GlobalSnackbar/utils";
import { Margins } from "components/Margins/Margins";
import {
Expand Down Expand Up @@ -37,6 +36,7 @@ import {
TableRowSkeleton,
} from "components/TableLoader/TableLoader";

import { ExternalImage } from "components/ExternalImage/ExternalImage";
import { useAuthenticated } from "hooks";
import { useExternalAuth } from "hooks/useExternalAuth";
import { RotateCcwIcon, SendIcon } from "lucide-react";
Expand All @@ -50,12 +50,12 @@ import { Link as RouterLink } from "react-router-dom";
import TextareaAutosize from "react-textarea-autosize";
import { pageTitle } from "utils/page";
import { relativeTime } from "utils/time";
import { ExternalAuthButton } from "../CreateWorkspacePage/ExternalAuthButton";
import { type UserOption, UsersCombobox } from "./UsersCombobox";

type TasksFilter = {
user: UserOption | undefined;
};

const TasksPage: FC = () => {
const { user, permissions } = useAuthenticated();
const [filter, setFilter] = useState<TasksFilter>({
Expand Down Expand Up @@ -201,21 +201,20 @@ type TaskFormProps = {
const TaskForm: FC<TaskFormProps> = ({ templates }) => {
const { user } = useAuthenticated();
const queryClient = useQueryClient();

const [templateId, setTemplateId] = useState<string>(templates[0].id);
const {
externalAuth,
externalAuthPollingState,
startPollingExternalAuth,
isLoadingExternalAuth,
externalAuthError,
} = useExternalAuth(
templates.find((t) => t.id === templateId)?.active_version_id,
const [selectedTemplateId, setSelectedTemplateId] = useState<string>(
templates[0].id,
);

const hasAllRequiredExternalAuth = externalAuth?.every(
(auth) => auth.optional || auth.authenticated,
const selectedTemplate = templates.find(
(t) => t.id === selectedTemplateId,
) as Template;
const { externalAuth, isLoadingExternalAuth, externalAuthError } =
useExternalAuth(selectedTemplate.active_version_id);
const missedExternalAuth = externalAuth?.filter(
(auth) => !auth.optional && !auth.authenticated,
);
const isMissingExternalAuth = missedExternalAuth
? missedExternalAuth.length > 0
: true;

const createTaskMutation = useMutation({
mutationFn: async ({ prompt, templateId }: CreateTaskMutationFnProps) =>
Expand All @@ -235,10 +234,6 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
const prompt = formData.get("prompt") as string;
const templateID = formData.get("templateID") as string;

if (!prompt || !templateID) {
return;
}

try {
await createTaskMutation.mutateAsync({
prompt,
Expand All @@ -253,8 +248,12 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
};

return (
<Form onSubmit={onSubmit} aria-label="Create AI task">
{Boolean(externalAuthError) && <ErrorAlert error={externalAuthError} />}
<form
onSubmit={onSubmit}
aria-label="Create AI task"
className="flex flex-col gap-4"
>
{externalAuthError && <ErrorAlert error={externalAuthError} />}

<fieldset
className="border border-border border-solid rounded-lg p-4"
Expand All @@ -274,7 +273,7 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
<div className="flex items-center justify-between pt-2">
<Select
name="templateID"
onValueChange={(value) => setTemplateId(value)}
onValueChange={(value) => setSelectedTemplateId(value)}
defaultValue={templates[0].id}
required
>
Expand All @@ -294,43 +293,61 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
</SelectContent>
</Select>

<Button
size="sm"
type="submit"
disabled={!hasAllRequiredExternalAuth}
>
<Spinner
loading={createTaskMutation.isPending || isLoadingExternalAuth}
>
<SendIcon />
</Spinner>
Run task
</Button>
<div className="flex items-center gap-2">
{missedExternalAuth && isMissingExternalAuth && (
<ExternalAuthButtons
template={selectedTemplate}
missedExternalAuth={missedExternalAuth}
/>
)}

<Button size="sm" type="submit" disabled={isMissingExternalAuth}>
<Spinner
loading={createTaskMutation.isPending || isLoadingExternalAuth}
>
<SendIcon />
</Spinner>
Run task
</Button>
</div>
</div>
</fieldset>
</form>
);
};

{!hasAllRequiredExternalAuth &&
externalAuth &&
externalAuth.length > 0 && (
<FormSection
title="External Authentication"
description="This template uses external services for authentication."
>
<FormFields>
{externalAuth.map((auth) => (
<ExternalAuthButton
key={auth.id}
auth={auth}
isLoading={externalAuthPollingState === "polling"}
onStartPolling={startPollingExternalAuth}
displayRetry={externalAuthPollingState === "abandoned"}
/>
))}
</FormFields>
</FormSection>
)}
</Form>
type ExternalAuthButtonProps = {
template: Template;
missedExternalAuth: TemplateVersionExternalAuth[];
};

const ExternalAuthButtons: FC<ExternalAuthButtonProps> = ({
template,
missedExternalAuth,
}) => {
const { startPollingExternalAuth, isLoadingExternalAuth } = useExternalAuth(
template.active_version_id,
);

return missedExternalAuth.map((auth) => {
return (
<Button
variant="outline"
key={auth.id}
size="sm"
disabled={isLoadingExternalAuth || auth.authenticated}
onClick={() => {
window.open(auth.authenticate_url, "_blank", "width=900,height=600");
startPollingExternalAuth();
}}
>
<Spinner loading={isLoadingExternalAuth}>
<ExternalImage src={auth.display_icon} />
</Spinner>
Login with {auth.display_name}
</Button>
);
});
};

type TasksFilterProps = {
Expand Down
Loading
0