Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 9 additions & 15 deletions resources/js/vue/components/BuildSummaryPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<BuildSummaryCard :build-id="buildId" />

<LoadingIndicator :is-loading="loading">
<BuildTimelineCard :build-id="buildId" />

<!-- Display link to create bug tracker issue if supported. -->
<div v-if="cdash.newissueurl">
<a
Expand Down Expand Up @@ -444,21 +446,20 @@

<script>
import {
faQuestionCircle,
faLink,
} from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
import LoadingIndicator from './shared/LoadingIndicator.vue';
import BuildSummaryCard from './shared/BuildSummaryCard.vue';
import BuildSidebar from './shared/BuildSidebar.vue';
import BuildTimelineCard from './BuildSummaryPage/BuildTimelineCard.vue';
import gql from 'graphql-tag';
import Utils from './shared/Utils';
import BuildTimeChart from './BuildSummaryPage/BuildTimeChart.vue';
import { DateTime, Duration } from 'luxon';

export default {
name: 'BuildSummaryPage',
components: { BuildTimeChart, BuildSummaryCard, LoadingIndicator, BuildSidebar, FontAwesomeIcon },
components: { BuildTimelineCard, BuildTimeChart, BuildSummaryCard, LoadingIndicator, BuildSidebar, FontAwesomeIcon },

props: {
projectId: {
Expand Down Expand Up @@ -486,10 +487,6 @@ export default {
type: String,
default: '',
},
userId: {
type: Number,
default: 0,
},
},

data() {
Expand All @@ -509,13 +506,17 @@ export default {
id
name
startTime
configureDuration
buildDuration
testDuration
buildType
configureErrorsCount
configureWarningsCount
buildErrorsCount
buildWarningsCount
failedTestsCount
notRunTestsCount
passedTestsCount
site {
id
name
Expand Down Expand Up @@ -617,12 +618,10 @@ export default {
this.cdash.test = {
nfailed: Math.max(0, build.failedTestsCount),
nnotrun: Math.max(0, build.notRunTestsCount),
npassed: Math.max(0, build.passedTestsCount),
};

this.cdash.projectname_encoded = encodeURIComponent(build.project.name);
this.cdash.user = {
id: this.userId,
};
},
error(error) {
this.errored = true;
Expand Down Expand Up @@ -674,15 +673,10 @@ export default {
computed: {
FA() {
return {
faQuestionCircle,
faLink,
};
},

Utils() {
return Utils;
},

isParentBuild() {
return !(this.buildData && this.buildData.subProject);
},
Expand Down
Loading