Commit cc57ae84 authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Update job info to fetch stdout and stderr from new endpoints

parent b03b6abe

client/src/components/JobInformation/JobInformation.test.js

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ describe("JobInformation/JobInformation.vue", () => { 
    beforeEach(() => {

        axiosMock = new MockAdapter(axios);

        axiosMock.onGet(new RegExp(`api/configuration/decode/*`)).reply(200, { decoded_id: 123 });

        axiosMock.onGet("/api/jobs/test_id?full=True&stdout_position=0&stdout_length=50000&stderr_position=0&stderr_length=50000").reply(200, jobResponse);

        axiosMock.onGet("/api/jobs/test_id?full=True").reply(200, jobResponse);

    });



    afterEach(() => {

client/src/components/JobInformation/JobInformation.vue

+34 −10
Original line number Diff line number Diff line 
<template>

    <div>

        <job-details-provider auto-refresh :jobId="job_id" :stdout_position=stdout_position :stdout_length=stdout_length :stderr_position=stderr_position :stderr_length=stderr_length @update:result="updateJob"/>

        <job-details-provider auto-refresh :job-id="job_id" @update:result="updateJob"/>

        <JobConsoleOutputProvider

            auto-refresh="True"

            :job-id="job_id"

            :stdout_position="stdout_position"

            :stdout_length="stdout_length"

            :stderr_position="stderr_position"

            :stderr_length="stderr_length"

            @update:result="updateConsoleOutputs"/>

        <h2 class="h-md">Job Information</h2>

        <table id="job-information" class="tabletip info_data_table">

            <tbody>
@@ -80,7 +88,7 @@ 
import { getAppRoot } from "onload/loadConfig";

import DecodedId from "../DecodedId.vue";

import CodeRow from "./CodeRow.vue";

import { JobDetailsProvider } from "components/providers/JobProvider";

import { JobDetailsProvider, JobConsoleOutputProvider } from "components/providers/JobProvider";

import UtcDate from "components/UtcDate";

import CopyToClipboard from "components/CopyToClipboard";

import JOB_STATES_MODEL from "utils/job-states-model";
@@ -91,6 +99,7 @@ export default { 
        CodeRow,

        DecodedId,

        JobDetailsProvider,

        JobConsoleOutputProvider,

        UtcDate,

        CopyToClipboard,

    },
@@ -131,16 +140,31 @@ export default { 
        },

        updateJob(job) {

            this.job = job;

            // Keep stdout in memory and only fetch new text via JobProvider

            if (job.tool_stdout != null) {

            // Load stored stdout and stderr

            if (this.jobIsTerminal) {

                if (job.tool_stdout) {

                    this.stdout_text += job.tool_stdout;

                    this.stdout_position += job.tool_stdout.length;

                }

            if (job.tool_stderr != null) {

                if (job.tool_stderr) {

                    this.stderr_text += job.tool_stderr;

                    this.stderr_position += job.tool_stderr.length;

                }

            }

        },

        updateConsoleOutputs(output) {

            // Keep stdout in memory and only fetch new text via JobProvider

            if (output && !this.jobIsTerminal) {

                if (output.stdout != null) {

                    this.stdout_text += output.stdout;

                    this.stdout_position += output.stdout.length;

                }

                if (output.stderr != null) {

                    this.stderr_text += output.stderr;

                    this.stderr_position += output.stderr.length;

                }

            }

        }

    },

};

</script>

client/src/components/providers/JobProvider.js

+13 −2
Original line number Diff line number Diff line
@@ -5,8 +5,18 @@ import { rethrowSimple } from "utils/simple-error"; 
import { stateIsTerminal } from "./utils";

import { cleanPaginationParameters } from "./utils";



async function jobDetails({ jobId, stdout_position = 0, stdout_length = 0, stderr_position = 0, stderr_length = 0 }) {

    const url = `${getAppRoot()}api/jobs/${jobId}?full=True&stdout_position=${stdout_position}&stdout_length=${stdout_length}&stderr_position=${stderr_position}&stderr_length=${stderr_length}`;

async function jobDetails({ jobId }) {

    const url = `${getAppRoot()}api/jobs/${jobId}?full=True`;

    try {

        const { data } = await axios.get(url);

        return data;

    } catch (e) {

        rethrowSimple(e);

    }

}



async function jobConsoleOutput({ jobId, stdout_position = 0, stdout_length = 0, stderr_position = 0, stderr_length = 0 }) {

    const url = `${getAppRoot()}api/jobs/${jobId}/console_output?stdout_position=${stdout_position}&stdout_length=${stdout_length}&stderr_position=${stderr_position}&stderr_length=${stderr_length}`;

    try {

        const { data } = await axios.get(url);

        return data;
@@ -26,6 +36,7 @@ async function jobProblems({ jobId }) { 
}



export const JobDetailsProvider = SingleQueryProvider(jobDetails, stateIsTerminal);

export const JobConsoleOutputProvider = SingleQueryProvider(jobConsoleOutput, stateIsTerminal);

export const JobProblemProvider = SingleQueryProvider(jobProblems, stateIsTerminal);



export function jobsProvider(ctx, callback, extraParams = {}) {