+
{children}
);
diff --git a/frontend/src/components/actors/actors-actor-details.tsx b/frontend/src/components/actors/actors-actor-details.tsx
index ef84c444db..7764e0fbf1 100644
--- a/frontend/src/components/actors/actors-actor-details.tsx
+++ b/frontend/src/components/actors/actors-actor-details.tsx
@@ -1,12 +1,6 @@
import { faQuestionSquare, Icon } from "@rivet-gg/icons";
-import {
- useQuery,
- useSuspenseInfiniteQuery,
- useSuspenseQuery,
-} from "@tanstack/react-query";
-import { useMatch } from "@tanstack/react-router";
-import { memo, type ReactNode, Suspense, useMemo } from "react";
-import { useInspectorCredentials } from "@/app/credentials-context";
+import { useQuery } from "@tanstack/react-query";
+import { memo, type ReactNode, Suspense } from "react";
import {
cn,
Flex,
@@ -15,12 +9,6 @@ import {
TabsList,
TabsTrigger,
} from "@/components";
-import { createEngineActorContext } from "@/queries/actor-engine";
-import { createInspectorActorContext } from "@/queries/actor-inspector";
-import {
- type NamespaceNameId,
- runnersQueryOptions,
-} from "@/queries/manager-engine";
import { ActorConfigTab } from "./actor-config-tab";
import { ActorConnectionsTab } from "./actor-connections-tab";
import { ActorDatabaseTab } from "./actor-db-tab";
@@ -28,13 +16,13 @@ import { ActorDetailsSettingsProvider } from "./actor-details-settings";
import { ActorEventsTab } from "./actor-events-tab";
import { ActorLogsTab } from "./actor-logs-tab";
import { ActorMetricsTab } from "./actor-metrics-tab";
-import { ActorProvider } from "./actor-queries-context";
import { ActorStateTab } from "./actor-state-tab";
import { QueriedActorStatus } from "./actor-status";
import { ActorStopButton } from "./actor-stop-button";
import { ActorsSidebarToggleButton } from "./actors-sidebar-toggle-button";
import { useActorsView } from "./actors-view-context-provider";
import { ActorConsole } from "./console/actor-console";
+import { GuardConnectableInspector } from "./guard-connectable-inspector";
import { useManager } from "./manager-context";
import { ActorFeature, type ActorId } from "./queries";
import { ActorWorkerContextProvider } from "./worker/actor-worker-context";
@@ -57,34 +45,32 @@ export const ActorsActorDetails = memo(
useManager().actorFeaturesQueryOptions(actorId),
);
- const supportsConsole = features?.includes(ActorFeature.Console);
+ const supportsConsole = features.includes(ActorFeature.Console);
return (
-
-
-
+
+
-
-
+ tab={tab}
+ onTabChange={onTabChange}
+ // onExportLogs={onExportLogs}
+ // isExportingLogs={isExportingLogs}
+ />
- {supportsConsole ? (
-
- ) : null}
-
Unavailable for sleeping Actors.
+
+
+ );
+ }
+
+ if (pendingAllocationAt && !startedAt) {
+ return (
+
+ Cannot start Actor, runners are out of capacity. Add more
+ runners to run the Actor or increase runner capacity.
+
+ );
+ }
+
+ return (
+
+ {children}
+
+ );
+}
+
+function ActorContextProvider(props: {
+ actorId: ActorId;
+ children: ReactNode;
+}) {
+ return __APP_TYPE__ === "inspector" ? (
+
+ ) : (
+
+ );
+}
+
+function ActorInspectorProvider({
+ actorId,
+ children,
+}: {
+ actorId: ActorId;
+ children: ReactNode;
+}) {
+ const { data } = useSuspenseQuery(useManager().actorQueryOptions(actorId));
+ const { credentials } = useInspectorCredentials();
+
+ if (!credentials?.url || !credentials?.token) {
+ throw new Error("Missing inspector credentials");
+ }
+
+ const actorContext = useMemo(() => {
+ return createInspectorActorContext({
+ ...credentials,
+ name: data.name || "",
+ });
+ }, [credentials, data.name]);
+
+ return {children};
+}
+
+function useActorRunner({ actorId }: { actorId: ActorId }) {
+ const { data: actor } = useSuspenseQuery(
+ useManager().actorQueryOptions(actorId),
+ );
+
+ const match = useMatch({
+ from: "/_layout/ns/$namespace",
+ });
+
+ if (!match.params.namespace || !actor.runner) {
+ throw new Error("Actor is missing required fields");
+ }
+
+ const { data: runner } = useQuery({
+ ...runnerByNameQueryOptions({
+ runnerName: actor.runner,
+ namespace: match.params.namespace as NamespaceNameId,
+ }),
+ refetchInterval: 1000,
+ });
+
+ return { actor, runner };
+}
+
+function useActorEngineContext({ actorId }: { actorId: ActorId }) {
+ const { actor, runner } = useActorRunner({ actorId });
+
+ const actorContext = useMemo(() => {
+ return createEngineActorContext({
+ token: (runner?.metadata?.inspectorToken as string) || "",
+ });
+ }, [runner?.metadata?.inspectorToken]);
+
+ return { actorContext, actor, runner };
+}
+
+function ActorEngineProvider({
+ actorId,
+ children,
+}: {
+ actorId: ActorId;
+ children: ReactNode;
+}) {
+ const { actorContext, actor, runner } = useActorEngineContext({ actorId });
+
+ if (!runner || !actor.runner) {
+ return (
+
+ );
+ }
+
+ return {children};
+}
+
+function NoRunnerInfo({ runner }: { runner: string }) {
+ return (
+
+ There are no runners connected to run this Actor.
+
+ Check that your application is running and the
+ runner name is
+
+ {runner}
+
+
+
+ );
+}
+
+function WakeUpActorButton({ actorId }: { actorId: ActorId }) {
+ const { runner, actorContext } = useActorEngineContext({ actorId });
+
+ const { mutate, isPending } = useMutation(
+ actorContext.actorWakeUpMutationOptions(actorId),
+ );
+ if (!runner) return null;
+ return (
+
+ );
+}
+
+function AutoWakeUpActor({ actorId }: { actorId: ActorId }) {
+ const { runner, actor, actorContext } = useActorEngineContext({ actorId });
+
+ const { isPending } = useQuery(
+ actorContext.actorAutoWakeUpQueryOptions(actorId, {
+ enabled: !!runner,
+ }),
+ );
+
+ if (!runner) return ;
+
+ return isPending ? (
+
+
+
+ Waiting for Actor to wake...
+
+
+ ) : null;
+}
diff --git a/frontend/src/components/ui/filters.tsx b/frontend/src/components/ui/filters.tsx
index 5ea92c340f..f847e77c24 100644
--- a/frontend/src/components/ui/filters.tsx
+++ b/frontend/src/components/ui/filters.tsx
@@ -116,7 +116,6 @@ function filterDefinitionToOptions(definition: FilterDefinition) {
function defaultFilterDefinitionOperator({
definition,
- filterValues,
}: {
definition: FilterDefinition;
filterValues: string[];
@@ -129,7 +128,6 @@ function defaultFilterDefinitionOperator({
const filterOperators = ({
definition,
- filterValues,
}: {
definition: FilterDefinition;
filterValues: string[];
@@ -311,7 +309,6 @@ const FilterValueCombobox = ({
function FilterDateValueCombobox({
id,
- definition,
operator,
value,
onChange,
@@ -390,8 +387,6 @@ function FilterBooleanValue({
function FilterStringValue({
id,
- operator,
- definition,
value,
onChange,
}: {
@@ -687,13 +682,14 @@ export type FilterDefinition =
// a filter that's only applied client-side and not sent to the server
ephemeral?: boolean;
excludes?: string[];
+ defaultValue?: string[];
}
| FilterSelectDefinition;
type FilterSelectDefinition = (
| FilterSelectStaticDefinition
| FilterSelectDynamicDefinition
-) & { ephemeral?: boolean };
+) & { ephemeral?: boolean; defaultValue?: string[] };
type FilterSelectStaticDefinition = {
type: "select";
@@ -730,14 +726,12 @@ export const FilterCreator = ({
value,
text = "Filter",
icon = ,
- showExcluded,
onChange,
}: {
definitions: FilterDefinitions;
value: Partial;
text?: string;
icon?: FunctionComponentElement;
- showExcluded?: boolean;
onChange: OnFiltersChange;
}) => {
const [open, setOpen] = useState(false);
@@ -1329,7 +1323,7 @@ export type FilterValue = z.infer;
export function createFiltersSchema(definitions: FilterDefinitions) {
const filters: Record = {};
- for (const [key, definition] of Object.entries(definitions)) {
+ for (const [key] of Object.entries(definitions)) {
filters[key] = FilterValueSchema;
}
@@ -1348,6 +1342,21 @@ export function createFiltersPicker(definitions: FilterDefinitions) {
);
const keys = Object.keys(defs);
+ const filtersWithDefaultValues = Object.fromEntries(
+ Object.entries(defs)
+ .filter(([, def]) => def.defaultValue !== undefined)
+ .map(([key, def]) => [
+ key,
+ {
+ value: def.defaultValue!,
+ operator: def.operators?.[0] ?? FilterOp.EQUAL,
+ },
+ ]),
+ );
+
+ // add missing default values to the object
+ object = { ...filtersWithDefaultValues, ...object };
+
return _.pick(object, keys);
};
}
diff --git a/frontend/src/queries/manager-engine.ts b/frontend/src/queries/manager-engine.ts
index 66543a9385..6d644f103b 100644
--- a/frontend/src/queries/manager-engine.ts
+++ b/frontend/src/queries/manager-engine.ts
@@ -281,6 +281,28 @@ export const runnerQueryOptions = (opts: {
});
};
+export const runnerByNameQueryOptions = (opts: {
+ namespace: NamespaceNameId;
+ runnerName: string;
+}) => {
+ return queryOptions({
+ queryKey: [opts.namespace, "runner", opts.runnerName],
+ enabled: !!opts.runnerName,
+ queryFn: async ({ signal: abortSignal }) => {
+ const data = await client.runners.list(
+ { namespace: opts.namespace, name: opts.runnerName },
+ {
+ abortSignal,
+ },
+ );
+ if (!data.runners[0]) {
+ throw new Error("Runner not found");
+ }
+ return data.runners[0];
+ },
+ });
+};
+
export const runnerNamesQueryOptions = (opts: {
namespace: NamespaceNameId;
}) => {