Skip to content
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

Jump to bottom

[v13] [Assist] Do not parse event data is there is none #27435

Merged
merged 3 commits into from
Jun 6, 2023
Merged

[v13] [Assist] Do not parse event data is there is none #27435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
437f2a5
[Assist] Do not parse event data is there is none
jakule Jun 5, 2023
9bc19f6
Move more code.
jakule Jun 5, 2023
65f95a6
Update web/packages/teleport/src/Assist/contexts/messages.tsx
jakule Jun 5, 2023
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
11 changes: 7 additions & 4 deletions web/packages/teleport/src/Assist/contexts/messages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ interface ExecEvent {
event: EventType.EXEC;
exitError?: string;
}

type SessionEvent = ExecEvent | { event: string };

const convertToQuery = (cmd: ExecuteRemoteCommandPayload): string => {
Expand Down Expand Up @@ -253,14 +254,16 @@ async function convertServerMessage(

const eventsResp = await api.fetch(sessionUrl + '/events');
const sessionExists = eventsResp.status === 200;
const eventsData = (await eventsResp.json()) as {
events: SessionEvent[];
};
const execEvent = eventsData.events.find(isExecEvent);

let msg;
let errorMsg;
if (sessionExists) {
// Get events only if the session exists. Otherwise, eventsData.events can be empty
// if the command execution failed.
const eventsData = (await eventsResp.json()) as {
events: SessionEvent[];
};
const execEvent = eventsData.events?.find(isExecEvent);
// The offset here is set base on A/B test that was run between me, myself and I.
const stream = await api.fetch(
sessionUrl + '/stream?offset=0&bytes=4096',
Expand Down