Skip to content

Commit

Permalink
Fix new run details can't scroll (#1346)
Browse files Browse the repository at this point in the history
  • Loading branch information
@goodoldneon
goodoldneon committed May 13, 2024
1 parent 7a4de9f commit 16c29e9
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 42 deletions.
2 changes: 1 addition & 1 deletion ...rganization-active)/(dashboard)/env/[environmentSlug]/functions/[slug]/runs/RunsTable.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {

export type Run = {
status: FunctionRunStatus;
durationMS: number;
durationMS: number | null;
id: string;
queuedAt: string;
endedAt: string;
Expand Down
26 changes: 17 additions & 9 deletions ...pp/(organization-active)/(dashboard)/env/[environmentSlug]/functions/[slug]/runs/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
type FunctionRunStatus,
type FunctionRunTimeField,
} from '@inngest/components/types/functionRun';
import { getTimestampDaysAgo } from '@inngest/components/utils/date';
import { getTimestampDaysAgo, toMaybeDate } from '@inngest/components/utils/date';
import { RiLoopLeftLine } from '@remixicon/react';
import { useQuery } from 'urql';

Expand Down Expand Up @@ -38,7 +38,7 @@ const GetRunsDocument = graphql(`
id
queuedAt
endedAt
durationMS
startedAt
status
}
}
Expand Down Expand Up @@ -117,13 +117,21 @@ export default function RunsPage() {
{
/* TODO: This is a temp parser */
}
const runs = data?.environment.runs.edges.map((edge) => ({
id: edge.node.id,
queuedAt: edge.node.queuedAt,
endedAt: edge.node.endedAt,
durationMS: edge.node.durationMS,
status: edge.node.status,
}));
const runs = data?.environment.runs.edges.map((edge) => {
const startedAt = toMaybeDate(edge.node.startedAt);
let durationMS = null;
if (startedAt) {
durationMS = (toMaybeDate(edge.node.endedAt) ?? new Date()).getTime() - startedAt.getTime();
}

return {
id: edge.node.id,
queuedAt: edge.node.queuedAt,
endedAt: edge.node.endedAt,
durationMS,
status: edge.node.status,
};
});

return (
<main className="h-full min-h-0 overflow-y-auto bg-white">
Expand Down
22 changes: 12 additions & 10 deletions ...ard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/runs/[runID]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,18 @@ export default function Page({ params }: Props) {
}

return (
<RunDetails
app={fn.app}
fn={fn}
getOutput={getOutput}
run={{
id: params.runID,
output: null,
trace: getFragmentData(TraceDetailsFragment, trace),
}}
/>
<div className="overflow-y-auto">
<RunDetails
app={fn.app}
fn={fn}
getOutput={getOutput}
run={{
id: params.runID,
output: null,
trace: getFragmentData(TraceDetailsFragment, trace),
}}
/>
</div>
);
}

Expand Down
4 changes: 2 additions & 2 deletions ui/apps/dashboard/src/gql/gql.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const documents = {
"\n mutation CreateFunctionReplay(\n $environmentID: UUID!\n $functionID: UUID!\n $name: String!\n $fromRange: ULID!\n $toRange: ULID!\n $statuses: [FunctionRunStatus!]\n ) {\n createFunctionReplay(\n input: {\n workspaceID: $environmentID\n workflowID: $functionID\n name: $name\n fromRange: $fromRange\n toRange: $toRange\n statuses: $statuses\n }\n ) {\n id\n }\n }\n": types.CreateFunctionReplayDocument,
"\n query GetFunctionRunsCount(\n $environmentID: ID!\n $functionSlug: String!\n $functionRunStatuses: [FunctionRunStatus!]\n $timeRangeStart: Time!\n $timeRangeEnd: Time!\n $timeField: FunctionRunTimeField!\n ) {\n environment: workspace(id: $environmentID) {\n function: workflowBySlug(slug: $functionSlug) {\n id\n runs: runsV2(\n filter: {\n status: $functionRunStatuses\n lowerTime: $timeRangeStart\n upperTime: $timeRangeEnd\n timeField: $timeField\n }\n ) {\n totalCount\n }\n }\n }\n }\n": types.GetFunctionRunsCountDocument,
"\n query GetReplays($environmentID: ID!, $functionSlug: String!) {\n environment: workspace(id: $environmentID) {\n id\n function: workflowBySlug(slug: $functionSlug) {\n id\n replays {\n id\n name\n createdAt\n endedAt\n functionRunsScheduledCount\n }\n }\n }\n }\n": types.GetReplaysDocument,
"\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n durationMS\n status\n }\n }\n }\n }\n }\n": types.GetRunsDocument,
"\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n startedAt\n status\n }\n }\n }\n }\n }\n": types.GetRunsDocument,
"\n mutation NewIngestKey($input: NewIngestKey!) {\n key: createIngestKey(input: $input) {\n id\n }\n }\n": types.NewIngestKeyDocument,
"\n query GetIngestKeys($environmentID: ID!) {\n environment: workspace(id: $environmentID) {\n ingestKeys {\n id\n name\n createdAt\n source\n }\n }\n }\n": types.GetIngestKeysDocument,
"\n mutation UpdateIngestKey($id: ID!, $input: UpdateIngestKey!) {\n updateIngestKey(id: $id, input: $input) {\n id\n name\n createdAt\n presharedKey\n url\n filter {\n type\n ips\n events\n }\n metadata\n }\n }\n": types.UpdateIngestKeyDocument,
Expand Down Expand Up @@ -317,7 +317,7 @@ export function graphql(source: "\n query GetReplays($environmentID: ID!, $func
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n durationMS\n status\n }\n }\n }\n }\n }\n"): (typeof documents)["\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n durationMS\n status\n }\n }\n }\n }\n }\n"];
export function graphql(source: "\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n startedAt\n status\n }\n }\n }\n }\n }\n"): (typeof documents)["\n query GetRuns(\n $environmentID: ID!\n $startTime: Time!\n $status: [FunctionRunStatus!]\n $timeField: FunctionRunTimeFieldV2\n ) {\n environment: workspace(id: $environmentID) {\n runs(\n filter: { from: $startTime, status: $status, timeField: $timeField }\n orderBy: [{ field: QUEUED_AT, direction: DESC }]\n ) {\n edges {\n node {\n id\n queuedAt\n endedAt\n startedAt\n status\n }\n }\n }\n }\n }\n"];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down
Loading

0 comments on commit 16c29e9

Please sign in to comment.