Skip to content
Open
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
107 changes: 86 additions & 21 deletions resources/js/vue/components/BuildSummaryPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -422,20 +422,33 @@

<!-- Graphs -->
<div class="tw-border tw-border-base-300 tw-rounded-lg tw-overflow-hidden">
<div class="tw-flex tw-items-center tw-justify-between tw-px-3 tw-py-1 tw-bg-base-200">
<div class="tw-flex tw-flex-wrap tw-items-center tw-justify-between tw-gap-2 tw-px-3 tw-py-1 tw-bg-base-200">
<span class="tw-text-base tw-font-bold">Build History</span>
<a
class="tw-btn tw-btn-sm tw-btn-outline"
data-test="build-history-link"
:href="$baseURL + '/index.php?project=' + cdash.projectname_encoded + '&filtercount=4&showfilters=1&filtercombine=and&field1=site&compare1=61&value1=' + cdash.build.sitename_encoded + '&field2=buildname&compare2=61&value2=' + cdash.build.name_encoded + '&field3=buildtype&compare3=61&value3=' + cdash.build.type_encoded + '&field4=buildstarttime&compare4=84&value4=' + cdash.build.starttime_encoded"
<TrendFilterBar
v-model="trendFilters"
:build="trendFilterBuild"
:filters="['sameSite', 'sameGroup']"
>
<FontAwesomeIcon :icon="FA.faLink" />
Show History
</a>
<a
class="tw-btn tw-btn-sm tw-btn-outline"
:class="{ 'tw-invisible': !buildHistoryUrl, 'tw-opacity-50 tw-pointer-events-none': $apollo.queries.buildHistory.loading }"
:aria-disabled="$apollo.queries.buildHistory.loading || undefined"
data-test="build-history-link"
:href="buildHistoryUrl && !$apollo.queries.buildHistory.loading ? buildHistoryUrl : undefined"
>
<FontAwesomeIcon :icon="FA.faLink" />
Show History
</a>
</TrendFilterBar>
</div>
<div class="tw-p-1">
<LoadingIndicator :is-loading="!buildHistory">
<BuildTimeChart :data="buildTimeData" />
<BuildTimeChart
class="tw-transition-opacity"
:class="{ 'tw-opacity-50': $apollo.queries.buildHistory.loading }"
:aria-busy="$apollo.queries.buildHistory.loading"
:data="buildTimeData"
/>
</LoadingIndicator>
</div>
</div>
Expand All @@ -455,11 +468,13 @@ import BuildSidebar from './shared/BuildSidebar.vue';
import BuildTimelineCard from './BuildSummaryPage/BuildTimelineCard.vue';
import gql from 'graphql-tag';
import BuildTimeChart from './BuildSummaryPage/BuildTimeChart.vue';
import TrendFilterBar from './shared/TrendFilterBar.vue';
import { loadTrendFilters, saveTrendFilters, trendBuildConditions, trendHistoryFilterParams } from './shared/TrendFilters';
import { DateTime, Duration } from 'luxon';

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

props: {
projectId: {
Expand Down Expand Up @@ -495,6 +510,7 @@ export default {
cdash: {},
loading: true,
errored: false,
trendFilters: loadTrendFilters('build'),
};
},

Expand Down Expand Up @@ -523,6 +539,7 @@ export default {
}
subProject {
id
name
}
project {
id
Expand Down Expand Up @@ -604,10 +621,6 @@ export default {
id: build.id,
nerrors: Math.max(0, build.buildErrorsCount),
nwarnings: Math.max(0, build.buildWarningsCount),
name_encoded: encodeURIComponent(build.name),
type_encoded: encodeURIComponent(build.buildType),
starttime_encoded: encodeURIComponent(build.startTime),
sitename_encoded: encodeURIComponent(build.site.name),
};

this.cdash.configure = {
Expand All @@ -620,8 +633,6 @@ export default {
nnotrun: Math.max(0, build.notRunTestsCount),
npassed: Math.max(0, build.passedTestsCount),
};

this.cdash.projectname_encoded = encodeURIComponent(build.project.name);
},
error(error) {
this.errored = true;
Expand All @@ -631,19 +642,25 @@ export default {
},
buildHistory: {
query: gql`
query($projectId: ID, $filters: ProjectBuildsFiltersMultiFilterInput, $onlyParents: Boolean) {
query($projectId: ID, $limit: Int!, $filters: ProjectBuildsFiltersMultiFilterInput, $onlyParents: Boolean) {
project(id: $projectId) {
id
builds(
first: 100,
first: $limit,
orderBy: [{column: START_TIME, order: DESC}],
filters: $filters
onlyParents: $onlyParents
) {
edges {
node {
id
name
buildType
startTime
site {
id
name
}
configureDuration
buildDuration
testDuration
Expand All @@ -660,6 +677,7 @@ export default {
variables() {
return {
projectId: this.projectId,
limit: this.trendFilters.limit,
filters: this.buildHistoryFilters,
onlyParents: this.isParentBuild,
};
Expand Down Expand Up @@ -687,9 +705,11 @@ export default {
}
const build = this.buildData;
const conditions = [
{ eq: { name: build.name } },
{ eq: { buildType: build.buildType } },
{ has: { site: { eq: { id: build.site.id } } } },
...trendBuildConditions(this.historyFilters, {
name: build.name,
buildType: build.buildType,
siteId: build.site.id,
}),
{ le: { startTime: build.startTime } },
];
if (build.subProject) {
Expand All @@ -698,6 +718,42 @@ export default {
return { all: conditions };
},

/**
* The build history is the history of builds with this build's name, so that filter is always applied.
*/
historyFilters() {
return {
...this.trendFilters,
sameName: true,
};
},

trendFilterBuild() {
return {
siteName: this.buildData?.site.name ?? '',
name: this.buildData?.name ?? '',
group: this.buildData?.buildType ?? '',
};
},

/**
* The builds page, filtered to the builds in the build history chart.
*/
buildHistoryUrl() {
if (!this.buildData || !this.buildHistory || this.buildHistory.length === 0) {
return '';
}
const build = this.buildData;
const params = trendHistoryFilterParams(this.historyFilters, {
name: build.name,
buildType: build.buildType,
siteName: build.site.name,
startTime: build.startTime,
}, this.buildHistory.at(-1).node.startTime);
const subproject = build.subProject ? `&subproject=${encodeURIComponent(build.subProject.name)}` : '';
return `${this.$baseURL}/index.php?project=${encodeURIComponent(build.project.name)}${subproject}&${params}`;
},

buildTimeData() {
if (!this.buildHistory) {
return [];
Expand All @@ -706,6 +762,9 @@ export default {
const build = edge.node;
return {
buildId: build.id,
buildName: build.name,
buildType: build.buildType,
siteName: build.site.name,
configureTime: Duration.fromObject({ seconds: Math.max(build.configureDuration, 0) }),
buildTime: Duration.fromObject({ seconds: Math.max(build.buildDuration, 0) }),
testTime: Duration.fromObject({ seconds: Math.max(build.testDuration, 0) }),
Expand All @@ -718,6 +777,12 @@ export default {
},
},

watch: {
trendFilters(filters) {
saveTrendFilters('build', filters);
},
},

methods: {
},
};
Expand Down
18 changes: 17 additions & 1 deletion resources/js/vue/components/BuildSummaryPage/BuildTimeChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
class="tw-w-full tw-h-60 tw-cursor-pointer"
:option="chartOption"
autoresize
data-test="build-time-chart"
:data-test-point-count="data.length"
@click="handleChartClick"
>
<template #tooltip="params">
Expand All @@ -11,6 +13,12 @@
class="tw-text-sm"
>
<strong>Start:</strong> {{ tooltipTimestamp(params[0].dataIndex) }}<br>
<template
v-for="field in tooltipBuildFields"
:key="field.key"
>
<strong>{{ field.label }}:</strong> {{ data[params[0].dataIndex]?.[field.key] }}<br>
</template>
<strong>Configure Time:</strong> {{ tooltipDuration(params[0].dataIndex, 'configureTime') }}<br>
<strong>Build Time:</strong> {{ tooltipDuration(params[0].dataIndex, 'buildTime') }}<br>
<strong>Test Time:</strong> {{ tooltipDuration(params[0].dataIndex, 'testTime') }}
Expand All @@ -22,6 +30,7 @@
<script>
import VChart from 'vue-echarts';
import Utils from '../shared/Utils';
import { variedBuildFields } from '../shared/TrendFilters';

import * as echarts from 'echarts/core';
import { CanvasRenderer } from 'echarts/renderers';
Expand Down Expand Up @@ -52,6 +61,9 @@ export default {
* buildTime: import('luxon').Duration,
* testTime: import('luxon').Duration,
* buildId: number | string,
* buildName: string,
* buildType: string,
* siteName: string,
* startTimestamp: import('luxon').DateTime | string,
* configureFailed: boolean,
* buildFailed: boolean,
Expand All @@ -65,6 +77,10 @@ export default {
},

computed: {
tooltipBuildFields() {
return variedBuildFields(this.data);
},

chartOption() {
return {
animation: false,
Expand All @@ -75,7 +91,7 @@ export default {
},
},
grid: {
left: '10px',
left: '30px',
right: '10px',
top: '20px',
bottom: '10px',
Expand Down
4 changes: 3 additions & 1 deletion resources/js/vue/components/TestIdPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,12 @@
<TestTrendChart
:test-name="test.name"
:project-id="Number(build.project.id)"
:project-name="build.project.name"
:site-id="Number(build.site.id)"
:site-name="build.site.name"
:build-name="build.name"
:build-type="build.buildType"
:build-start-time="build.startTime"
:test-history-url="testHistoryUrl"
:numeric-measurements="numericMeasurements"
:enable-test-timing="build.project.enableTestTiming"
:test-time-std-multiplier="build.project.testTimeStdMultiplier"
Expand Down Expand Up @@ -377,6 +378,7 @@ export default {
startTime
site {
id
name
}
project {
id
Expand Down
Loading
Loading