Skip to content

Commit 8a12f60

Browse files
committed
Apply asher's review comments
1 parent db8a91b commit 8a12f60

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

site/src/hooks/useExternalAuth.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ export const useExternalAuth = (versionId: string | undefined) => {
5050
externalAuthPollingState,
5151
isLoadingExternalAuth,
5252
externalAuthError: error,
53+
isPollingExternalAuth: externalAuthPollingState === "polling",
5354
};
5455
};

site/src/pages/TasksPage/TasksPage.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
207207
const selectedTemplate = templates.find(
208208
(t) => t.id === selectedTemplateId,
209209
) as Template;
210-
const { externalAuth, isLoadingExternalAuth, externalAuthError } =
210+
const { externalAuth, externalAuthError, isPollingExternalAuth } =
211211
useExternalAuth(selectedTemplate.active_version_id);
212212
const missedExternalAuth = externalAuth?.filter(
213213
(auth) => !auth.optional && !auth.authenticated,
@@ -294,7 +294,7 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
294294
</Select>
295295

296296
<div className="flex items-center gap-2">
297-
{missedExternalAuth && isMissingExternalAuth && (
297+
{missedExternalAuth && (
298298
<ExternalAuthButtons
299299
template={selectedTemplate}
300300
missedExternalAuth={missedExternalAuth}
@@ -303,7 +303,7 @@ const TaskForm: FC<TaskFormProps> = ({ templates }) => {
303303

304304
<Button size="sm" type="submit" disabled={isMissingExternalAuth}>
305305
<Spinner
306-
loading={createTaskMutation.isPending || isLoadingExternalAuth}
306+
loading={createTaskMutation.isPending || isPollingExternalAuth}
307307
>
308308
<SendIcon />
309309
</Spinner>
@@ -325,7 +325,7 @@ const ExternalAuthButtons: FC<ExternalAuthButtonProps> = ({
325325
template,
326326
missedExternalAuth,
327327
}) => {
328-
const { startPollingExternalAuth, isLoadingExternalAuth } = useExternalAuth(
328+
const { startPollingExternalAuth, isPollingExternalAuth } = useExternalAuth(
329329
template.active_version_id,
330330
);
331331

@@ -335,16 +335,16 @@ const ExternalAuthButtons: FC<ExternalAuthButtonProps> = ({
335335
variant="outline"
336336
key={auth.id}
337337
size="sm"
338-
disabled={isLoadingExternalAuth || auth.authenticated}
338+
disabled={isPollingExternalAuth || auth.authenticated}
339339
onClick={() => {
340340
window.open(auth.authenticate_url, "_blank", "width=900,height=600");
341341
startPollingExternalAuth();
342342
}}
343343
>
344-
<Spinner loading={isLoadingExternalAuth}>
344+
<Spinner loading={isPollingExternalAuth}>
345345
<ExternalImage src={auth.display_icon} />
346346
</Spinner>
347-
Login with {auth.display_name}
347+
Connect to {auth.display_name}
348348
</Button>
349349
);
350350
});

0 commit comments

Comments
 (0)