Skip to content
Merged
Changes from all 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
90 changes: 40 additions & 50 deletions apps/web/src/components/settings/ScheduledTasksSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PlusIcon,
Trash2Icon,
} from "lucide-react";
import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { type ReactNode, useEffect, useRef, useState } from "react";
import type {
EnvironmentId,
ModelSelection,
Expand Down Expand Up @@ -250,9 +250,9 @@ export function ScheduledTasksSettings(target: {
environmentId: EnvironmentId;
task: ScheduledTask | null;
} | null>(null);
const openForEdit = useCallback((environmentId: EnvironmentId, task: ScheduledTask) => {
const openForEdit = (environmentId: EnvironmentId, task: ScheduledTask) => {
setEditor({ environmentId, task });
}, []);
};
const defaultEnvironment = environment ?? connectedEnvironments[0];
const canCreate = useAtomValue(
serverEnvironment.upsertScheduledTask.permissionAtom(defaultEnvironment?.environmentId ?? null),
Expand Down Expand Up @@ -340,32 +340,28 @@ function ScheduledTaskEnvironmentList({
}) {
const { scope, environments } = useSettingsScope();
const states = useAtomValue(
useMemo(
() =>
Atom.make((get) =>
environments.map((environment) => {
const connected =
environment.connection.phase === "connected" && environment.serverConfig !== null;
const query = connected
? get(
serverEnvironment.scheduledTasksLive({
environmentId: environment.environmentId,
input: {},
}),
)
: null;
const data = query === null ? null : Option.getOrNull(AsyncResult.value(query));
return {
environment,
connected,
tasks: data?.tasks.filter((task) =>
matchesScheduledTaskScope(scope, environment.environmentId, task.projectId),
),
error: query?._tag === "Failure" ? formatEnvironmentQueryError(query.cause) : null,
};
}),
),
[environments, scope],
Atom.make((get) =>
environments.map((environment) => {
const connected =
environment.connection.phase === "connected" && environment.serverConfig !== null;
const query = connected
? get(
serverEnvironment.scheduledTasksLive({
environmentId: environment.environmentId,
input: {},
}),
)
: null;
const data = query === null ? null : Option.getOrNull(AsyncResult.value(query));
return {
environment,
connected,
tasks: data?.tasks.filter((task) =>
matchesScheduledTaskScope(scope, environment.environmentId, task.projectId),
),
error: query?._tag === "Failure" ? formatEnvironmentQueryError(query.cause) : null,
};
}),
),
);
const linkedState = states.find((state) => state.environment.environmentId === environmentId);
Expand Down Expand Up @@ -937,14 +933,10 @@ function ScheduledTaskEditorDialog({
connected ? serverEnvironment.scheduledTasksLive({ environmentId, input: {} }) : null,
);
const allProjects = useProjects();
const projects = useMemo(
() =>
allProjects.filter(
(project) =>
project.environmentId === environmentId &&
matchesScheduledTaskScope(scope, environmentId, project.id),
),
[allProjects, environmentId, scope],
const projects = allProjects.filter(
(project) =>
project.environmentId === environmentId &&
matchesScheduledTaskScope(scope, environmentId, project.id),
);
const settings = useEnvironmentSettings(environmentId);
const providers =
Expand All @@ -969,16 +961,12 @@ function ScheduledTaskEditorDialog({
: task;
const selectedProjectId = draft.projectId || projects[0]?.id || "";
const selectedProject = projects.find((project) => project.id === selectedProjectId);
const instanceEntries = useMemo(
() =>
sortProviderInstanceEntries(
applyProviderInstanceSettings(
deriveProviderInstanceEntries(providers),
settings,
selectedProject?.id ?? null,
),
),
[providers, settings, selectedProject?.id],
const instanceEntries = sortProviderInstanceEntries(
applyProviderInstanceSettings(
deriveProviderInstanceEntries(providers),
settings,
selectedProject?.id ?? null,
),
);

const firstInstance = instanceEntries[0];
Expand All @@ -991,9 +979,11 @@ function ScheduledTaskEditorDialog({
const activeInstanceId =
activeSelection?.instanceId ?? firstInstance?.instanceId ?? ("" as ProviderInstanceId);
const activeModel = activeSelection?.model ?? "";
const modelOptionsByInstance = useMemo(
() => getCustomModelOptionsByInstance(settings, providers, activeInstanceId, activeModel),
[settings, providers, activeInstanceId, activeModel],
const modelOptionsByInstance = getCustomModelOptionsByInstance(
settings,
providers,
activeInstanceId,
activeModel,
);

const reportFailure = (title: string, error: unknown) => {
Expand Down
Loading