*/
// @flow
import React from 'react';
+import { uniq } from 'lodash';
import moment from 'moment';
import QualityGate from '../qualityGate/QualityGate';
import BugsAndVulnerabilities from '../main/BugsAndVulnerabilities';
import CodeSmells from '../main/CodeSmells';
import Coverage from '../main/Coverage';
import Duplications from '../main/Duplications';
-import Meta from './../meta/Meta';
+import Meta from '../meta/Meta';
+import throwGlobalError from '../../../app/utils/throwGlobalError';
import { getMeasuresAndMeta } from '../../../api/measures';
import { getAllTimeMachineData } from '../../../api/time-machine';
import { enhanceMeasuresWithMetrics } from '../../../helpers/measures';
periods: r.periods
});
}
- });
+ }, throwGlobalError);
}
loadHistory(component: Component) {
- const metrics = HISTORY_METRICS_LIST.concat(GRAPHS_METRICS[getGraph()]);
+ const metrics = uniq(HISTORY_METRICS_LIST.concat(GRAPHS_METRICS[getGraph()]));
return getAllTimeMachineData(component.key, metrics).then(r => {
if (this.mounted) {
const history: History = {};
const historyStartDate = history[HISTORY_METRICS_LIST[0]][0].date;
this.setState({ history, historyStartDate });
}
- });
+ }, throwGlobalError);
}
renderLoading() {
import React from 'react';
import classNames from 'classnames';
import moment from 'moment';
+import { throttle } from 'lodash';
import ProjectActivityAnalysis from './ProjectActivityAnalysis';
import FormattedDate from '../../../components/ui/FormattedDate';
import { translate } from '../../../helpers/l10n';
badges: HTMLCollection<HTMLElement>;
props: Props;
+ constructor(props: Props) {
+ super(props);
+ this.handleScroll = throttle(this.handleScroll, 20);
+ }
+
componentDidMount() {
this.badges = document.getElementsByClassName('project-activity-version-badge');
}
onScroll={this.handleScroll}
ref={element => (this.scrollContainer = element)}>
{byVersionByDay.map((version, idx) => (
- <li key={idx + version.version}>
+ <li key={version.key || 'noversion'}>
{version.version &&
<div className={classNames('project-activity-version-badge', { first: idx === 0 })}>
<span className="badge">
changeEvent: (event: string, name: string) => Promise<*>,
deleteAnalysis: (analysis: string) => Promise<*>,
deleteEvent: (analysis: string, event: string) => Promise<*>,
+ graphLoading: boolean,
loading: boolean,
project: { configuration?: { showHistory: boolean }, key: string, leakPeriodDate: string },
metrics: Array<Metric>,
};
render() {
- const { loading, measuresHistory, query } = this.props;
+ const { measuresHistory, query } = this.props;
const { filteredAnalyses } = this.state;
const { configuration } = this.props.project;
const canAdmin = configuration ? configuration.showHistory : false;
changeEvent={this.props.changeEvent}
deleteAnalysis={this.props.deleteAnalysis}
deleteEvent={this.props.deleteEvent}
- loading={loading}
+ loading={this.props.loading}
/>
</div>
<div className="project-activity-layout-page-main">
<ProjectActivityGraphs
analyses={filteredAnalyses}
leakPeriodDate={moment(this.props.project.leakPeriodDate).toDate()}
- loading={loading}
+ loading={this.props.graphLoading}
measuresHistory={measuresHistory}
metricsType={this.getMetricType()}
project={this.props.project.key}
elem && elem.classList.add('dashboard-page');
}
- componentDidUpdate(prevProps: Props) {
- if (prevProps.location.query !== this.props.location.query) {
- const query = parseQuery(this.props.location.query);
+ componentWillReceiveProps(nextProps: Props) {
+ if (nextProps.location.query !== this.props.location.query) {
+ const query = parseQuery(nextProps.location.query);
if (query.graph !== this.state.query.graph) {
this.updateGraphData(query.graph);
}
);
};
- fetchMeasuresHistory = (metrics: Array<string>): Promise<Array<MeasureHistory>> =>
- getAllTimeMachineData(this.props.project.key, metrics).then(
+ fetchMeasuresHistory = (metrics: Array<string>): Promise<Array<MeasureHistory>> => {
+ return getAllTimeMachineData(this.props.project.key, metrics).then(
({ measures }) =>
measures.map(measure => ({
metric: measure.metric,
})),
throwGlobalError
);
+ };
fetchMetrics = (): Promise<Array<Metric>> => getMetrics().catch(throwGlobalError);
firstLoadData() {
const { query } = this.state;
const graphMetrics = GRAPHS_METRICS[query.graph];
+ const ignoreHistory = this.shouldRedirect();
Promise.all([
this.fetchActivity(query.project, 1, 100, serializeQuery(query)),
this.fetchMetrics(),
- this.fetchMeasuresHistory(graphMetrics)
+ ignoreHistory ? Promise.resolve() : this.fetchMeasuresHistory(graphMetrics)
]).then(response => {
if (this.mounted) {
- this.setState({
- analyses: response[0].analyses,
- analysesLoading: true,
- graphLoading: false,
- loading: false,
- metrics: response[1],
- measuresHistory: response[2],
- paging: response[0].paging
- });
-
- this.loadAllActivities(query.project).then(({ analyses, paging }) => {
- if (this.mounted) {
+ setTimeout(() => {
+ const newState = {
+ analyses: response[0].analyses,
+ analysesLoading: true,
+ loading: false,
+ metrics: response[1],
+ paging: response[0].paging
+ };
+ if (ignoreHistory) {
+ this.setState(newState);
+ } else {
this.setState({
- analyses,
- analysesLoading: false,
- paging
+ ...newState,
+ graphLoading: false,
+ measuresHistory: response[2]
});
}
- });
+
+ this.loadAllActivities(query.project).then(({ analyses, paging }) => {
+ if (this.mounted) {
+ this.setState({
+ analyses,
+ analysesLoading: false,
+ paging
+ });
+ }
+ });
+ }, 1000);
}
});
}
changeEvent={this.changeEvent}
deleteAnalysis={this.deleteAnalysis}
deleteEvent={this.deleteEvent}
- graphLoading={this.state.graphLoading}
+ graphLoading={this.state.loading || this.state.graphLoading}
loading={this.state.loading}
metrics={this.state.metrics}
measuresHistory={this.state.measuresHistory}
addCustomEvent: () => {},
addVersion: () => {},
analyses: ANALYSES,
+ analysesLoading: false,
changeEvent: () => {},
deleteAnalysis: () => {},
deleteEvent: () => {},
+ graphLoading: false,
loading: false,
project: {
key: 'org.sonarsource.sonarqube:sonarqube',
},
]
}
+ analysesLoading={false}
canAdmin={false}
changeEvent={[Function]}
className="boxed-group-inner"
]
}
eventFilter=""
- graphEndDate={null}
- graphStartDate={null}
+ graphEndDate={2016-10-27T14:33:50.000Z}
+ graphStartDate={2016-10-26T10:17:29.000Z}
leakPeriodDate="2017-05-16T13:50:02+0200"
loading={false}
metricsType="INT"
updateGraphZoom={[Function]}
/>
<GraphsZoom
- graphEndDate={null}
- graphStartDate={null}
+ graphEndDate={2016-10-27T14:33:50.000Z}
+ graphStartDate={2016-10-26T10:17:29.000Z}
leakPeriodDate="2017-05-16T13:50:02+0200"
loading={false}
metricsType="INT"
exports[`should render correctly with filter history on dates 1`] = `
Object {
- "graphEndDate": null,
- "graphStartDate": "2016-10-27T12:21:15+0200",
"series": Array [
Object {
"data": Array [
analyses: Array<Analysis>
): Array<{
version: ?string,
+ key: ?string,
byDay: { [string]: Array<Analysis> }
}> =>
analyses.reduce((acc, analysis) => {
if (acc.length === 0) {
- acc.push({ version: undefined, byDay: {} });
+ acc.push({ version: undefined, key: undefined, byDay: {} });
}
const currentVersion = acc[acc.length - 1];
const day = moment(analysis.date).startOf('day').valueOf().toString();
const lastEvent = sortedEvents[sortedEvents.length - 1];
if (lastEvent && lastEvent.category === 'VERSION') {
currentVersion.version = lastEvent.name;
- acc.push({ version: undefined, byDay: {} });
+ currentVersion.key = lastEvent.key;
+ acc.push({ version: undefined, key: undefined, byDay: {} });
}
return acc;
}, []);
width={size}
height={size}>
<path
- style={{ fill: '#fff', stroke: 'currentColor', strokeWidth: '3px' }}
+ style={{ fill: '#fff', stroke: 'currentColor', strokeWidth: '2px' }}
d="M8 2 L14 8 L8 14 L2 8 L8 2 L14 8"
/>
</svg>
.line-chart-path {
clip-path: url(#chart-clip);
}
+
+ .leak-chart-rect {
+ clip-path: url(#chart-clip);
+ }
}
.chart-zoom-tick {
projects / sonarqube.git / commitdiff