Unverified Commit 29100ed2 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14102 from jmchilton/fix_workflow_invocations_only 

Fix showing invocations for a particular workflow.
parents 59221e7d fd29743b

client/src/components/DatasetInformation/DatasetDetails.vue

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
                    <JobDetailsProvider

                        v-if="!isDatasetLoading && dataset.creating_job !== null"

                        v-slot="{ result: job, loading: isJobLoading }"

                        :jobid="dataset.creating_job"

                        :jobId="dataset.creating_job"

                        auto-refresh>

                        <div v-if="!isJobLoading">

                            <dataset-information class="detail" :hda_id="datasetId" />

client/src/components/DatasetInformation/DatasetError.vue

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
            <JobDetailsProvider

                v-if="!datasetLoading"

                v-slot="{ result: jobDetails, loading }"

                :jobid="dataset.creating_job"

                :jobId="dataset.creating_job"

                @error="onError">

                <div v-if="!loading">

                    <div class="page-container edit-attr">
@@ -24,7 +24,7 @@ 
                        :tool-stderr="jobDetails.tool_stderr"

                        :job-stderr="jobDetails.job_stderr"

                        :job-messages="jobDetails.job_messages" />

                    <JobProblemProvider v-slot="{ result: jobProblems }" :jobid="dataset.creating_job" @error="onError">

                    <JobProblemProvider v-slot="{ result: jobProblems }" :jobId="dataset.creating_job" @error="onError">

                        <div v-if="jobProblems && (jobProblems.has_duplicate_inputs || jobProblems.has_empty_inputs)">

                            <h3 class="common_problems mt-3">Detected Common Potential Problems</h3>

                            <p v-if="jobProblems.has_empty_inputs" id="dataset-error-has-empty-inputs">

client/src/components/JobInformation/JobInformation.vue

+1 −1
Original line number Diff line number Diff line 
<template>

    <div>

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

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

        <h3>Job Information</h3>

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

            <tbody>

client/src/components/providers/JobProvider.js

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

import { cleanPaginationParameters } from "./utils";



async function jobDetails({ jobid }) {

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

async function jobDetails({ jobId }) {

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

    try {

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

        return data;
@@ -15,8 +15,8 @@ async function jobDetails({ jobid }) { 
    }

}



async function jobProblems({ jobid }) {

    const url = `${getAppRoot()}api/jobs/${jobid}/common_problems`;

async function jobProblems({ jobId }) {

    const url = `${getAppRoot()}api/jobs/${jobId}/common_problems`;

    try {

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

        return data;

client/src/components/providers/SingleQueryProvider.js

+3 −1
Original line number Diff line number Diff line 
import hash from "object-hash";

import { LastQueue } from "utils/promise-queue";

import { HasAttributesMixin } from "./utils";



/**

 * Builds a provider that gets its result from a single promise-based query function and
@@ -14,6 +15,7 @@ import { LastQueue } from "utils/promise-queue"; 
export const SingleQueryProvider = (lookup, stopRefresh = (result) => false) => {

    const promiseCache = new Map();

    return {

        mixins: [HasAttributesMixin],

        props: {

            useCache: {

                type: Boolean,
@@ -74,7 +76,7 @@ export const SingleQueryProvider = (lookup, stopRefresh = (result) => false) => 
                        promiseCache.set(this.cacheKey, lookupPromise);

                    }

                } else {

                    lookupPromise = this.queue.enqueue(lookup, this.$attrs);

                    lookupPromise = this.queue.enqueue(lookup, this.attributes);

                }

                lookupPromise.then(

                    (result) => {