Commit f169f8e7 authored by Dannon Baker's avatar Dannon Baker
Browse files

Add status type to collection progress tooltips

parent 1d573634

client/src/components/History/Content/Collection/CollectionProgress.vue

+8 −8
Original line number Diff line number Diff line
@@ -6,24 +6,24 @@ model, so probably has to go eventually.--> 
        <b-progress v-if="!summary.isTerminal" :max="summary.jobCount">

            <b-progress-bar

                v-if="summary.errorCount"

                v-b-tooltip.hover="summary.errorCountText"

                :value="summary.errorCount"

                variant="danger"

                v-b-tooltip.hover="summary.errorCount" />

                variant="danger" />

            <b-progress-bar

                v-if="summary.okCount"

                v-b-tooltip.hover="summary.okCountText"

                :value="summary.okCount"

                variant="success"

                v-b-tooltip.hover="summary.okCount" />

                variant="success" />

            <b-progress-bar

                v-if="summary.runningCount"

                v-b-tooltip.hover="summary.runningCountText"

                :value="summary.runningCount"

                variant="warning"

                v-b-tooltip.hover="summary.runningCount" />

                variant="warning" />

            <b-progress-bar

                v-if="summary.waitingCount"

                v-b-tooltip.hover="summary.waitingCountText"

                :value="summary.waitingCount"

                variant="secondary"

                v-b-tooltip.hover="summary.waitingCount" />

                variant="secondary" />

        </b-progress>

    </div>

</template>

client/src/components/History/Content/Collection/JobStateSummary.js

+20 −0
Original line number Diff line number Diff line
@@ -71,19 +71,39 @@ export class JobStateSummary extends Map { 
        return this.get("ok");

    }



    get okCountText() {

        return `${this.okCount} OK`;

    }



    get jobCount() {

        return this.get("all_jobs");

    }



    get jobCountText() {

        return `${this.jobCount} Total Jobs`;

    }



    get errorCount() {

        return (this.get("error") || 0) + (this.get("failed") || 0) + (this.get("deleted") || 0);

    }



    get errorCountText() {

        return `${this.errorCount} Error`;

    }



    get runningCount() {

        return this.get("running");

    }



    get runningCountText() {

        return `${this.runningCount} Running`;

    }



    get waitingCount() {

        return (this.get("queued") || 0) + (this.get("waiting") || 0) + (this.get("paused") || 0);

    }



    get waitingCountText() {

        return `${this.waitingCount} Waiting`;

    }

}