*/
import { getJSON, RequestData, postJSON, post } from '../helpers/request';
import throwGlobalError from '../app/utils/throwGlobalError';
-import { Measure, MeasurePeriod } from '../helpers/measures';
-import { Metric, CustomMeasure, Paging, BranchParameters } from '../app/types';
+import {
+ Metric,
+ CustomMeasure,
+ Paging,
+ BranchParameters,
+ Measure,
+ MeasurePeriod
+} from '../app/types';
import { Period } from '../helpers/periods';
export function getMeasures(
-import { Measure, MeasureEnhanced } from '../helpers/measures';
-
/*
* SonarQube
* Copyright (C) 2009-2018 SonarSource SA
name: string;
}
+interface ComponentMeasureIntern {
+ isFavorite?: boolean;
+ isRecentlyBrowsed?: boolean;
+ key: string;
+ match?: string;
+ name: string;
+ organization?: string;
+ project?: string;
+ qualifier: string;
+ refKey?: string;
+}
+
+export interface ComponentMeasure extends ComponentMeasureIntern {
+ measures?: Measure[];
+}
+
+export interface ComponentMeasureEnhanced extends ComponentMeasureIntern {
+ value?: string;
+ leak?: string;
+ measures: MeasureEnhanced[];
+}
+
export interface Condition {
error: string;
id: number;
status?: { qualityGateStatus: string };
}
-interface ComponentMeasureIntern {
- isFavorite?: boolean;
- isRecentlyBrowsed?: boolean;
- key: string;
- match?: string;
- name: string;
- organization?: string;
- project?: string;
- qualifier: string;
- refKey?: string;
+export interface MeasurePeriod {
+ bestValue?: boolean;
+ index: number;
+ value: string;
}
-export interface ComponentMeasure extends ComponentMeasureIntern {
- measures?: Measure[];
+interface MeasureIntern {
+ bestValue?: boolean;
+ periods?: MeasurePeriod[];
+ value?: string;
}
-export interface ComponentMeasureEnhanced extends ComponentMeasureIntern {
- value?: string;
+export interface Measure extends MeasureIntern {
+ metric: string;
+}
+
+export interface MeasureEnhanced extends MeasureIntern {
+ metric: Metric;
leak?: string;
- measures: MeasureEnhanced[];
}
export interface Metric {
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-import { Measure } from '../../helpers/measures';
+import { Measure } from '../../app/types';
export interface Component extends Breadcrumb {
branch?: string;
import { complementary } from '../config/complementary';
import { enhanceComponent, isFileType, isViewType } from '../utils';
import { getProjectUrl } from '../../../helpers/urls';
-import { isDiffMetric, MeasureEnhanced } from '../../../helpers/measures';
+import { isDiffMetric } from '../../../helpers/measures';
import { isSameBranchLike, getBranchLikeQuery } from '../../../helpers/branches';
import DeferredSpinner from '../../../components/common/DeferredSpinner';
import {
+ BranchLike,
ComponentMeasure,
ComponentMeasureEnhanced,
- BranchLike,
+ CurrentUser,
+ isLoggedIn,
Metric,
- Paging
+ Paging,
+ MeasureEnhanced
} from '../../../app/types';
import { RequestData } from '../../../helpers/request';
import { Period } from '../../../helpers/periods';
branchLike?: BranchLike;
className?: string;
component: ComponentMeasure;
- currentUser: { isLoggedIn: boolean };
+ currentUser: CurrentUser;
loading: boolean;
+ loadingMore: boolean;
leakPeriod?: Period;
measure?: MeasureEnhanced;
metric: Metric;
}
interface State {
- bestValue?: string;
components: ComponentMeasureEnhanced[];
metric?: Metric;
paging?: Paging;
if (metric === this.props.metric) {
if (this.mounted) {
this.setState(({ selected }: State) => ({
- bestValue: r.metrics[0].bestValue,
components: r.components.map(component =>
enhanceComponent(component, metric, metrics)
),
- metric,
+ metric: { ...metric, ...r.metrics.find(m => m.key === metric.key) },
paging: r.paging,
selected:
- r.components.length > 0 && !r.components.find(c => c.key === selected)
- ? r.components[0].key
- : selected,
+ r.components.length > 0 && r.components.find(c => c.key === selected)
+ ? selected
+ : undefined,
view
}));
}
const { metricKeys, opts, strategy } = this.getComponentRequestParams(view, metric, {
p: paging.pageIndex + 1
});
- this.props.updateLoading({ components: true });
+ this.props.updateLoading({ moreComponents: true });
getComponentTree(strategy, component.key, metricKeys, opts).then(
r => {
if (metric === this.props.metric) {
if (this.mounted) {
this.setState(state => ({
- bestValue: r.metrics[0].bestValue,
components: [
...state.components,
...r.components.map(component => enhanceComponent(component, metric, metrics))
],
- metric,
+ metric: { ...metric, ...r.metrics.find(m => m.key === metric.key) },
paging: r.paging,
view
}));
}
- this.props.updateLoading({ components: false });
+ this.props.updateLoading({ moreComponents: false });
}
},
- () => this.props.updateLoading({ components: false })
+ () => this.props.updateLoading({ moreComponents: false })
);
};
const selectedIdx = this.getSelectedIndex();
return (
<FilesView
- bestValue={this.state.bestValue}
branchLike={this.props.branchLike}
components={this.state.components}
fetchMore={this.fetchMoreComponents}
handleOpen={this.onOpenComponent}
handleSelect={this.onSelectComponent}
+ loadingMore={this.props.loadingMore}
metric={metric}
metrics={this.props.metrics}
paging={this.state.paging}
render() {
const { branchLike, component, currentUser, measure, metric, rootComponent, view } = this.props;
- const isLoggedIn = currentUser && currentUser.isLoggedIn;
const isFile = isFileType(component);
const selectedIdx = this.getSelectedIndex();
return (
rootComponent={rootComponent}
/>
{component.key !== rootComponent.key &&
- isLoggedIn && (
+ isLoggedIn(currentUser) && (
<MeasureFavoriteContainer
branchLike={branchLike}
className="measure-favorite spacer-right"
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-// @flow
-import React from 'react';
-import MeasureContent from './MeasureContent';
-/*:: import type { Component, Period, Query } from '../types'; */
-/*:: import type { MeasureEnhanced } from '../../../components/measure/types'; */
-/*:: import type { Metric } from '../../../store/metrics/actions'; */
-/*:: import type { RawQuery } from '../../../helpers/query'; */
-
-/*:: type Props = {|
- branchLike?: { id?: string; name: string },
- className?: string,
- currentUser: { isLoggedIn: boolean },
- rootComponent: Component,
- fetchMeasures: (
- component: string,
- metricsKey: Array<string>,
- branchLike?: { id?: string; name: string }
- ) => Promise<{ component: Component, measures: Array<MeasureEnhanced> }>,
- leakPeriod?: Period,
- metric: Metric,
- metrics: { [string]: Metric },
- router: {
- push: ({ pathname: string, query?: RawQuery }) => void
- },
- selected: ?string,
- updateQuery: Query => void,
- view: string
-|}; */
-
-/*:: type State = {
- component: ?Component,
- loading: {
- measure: boolean,
- components: boolean
- },
- measure: ?MeasureEnhanced,
- secondaryMeasure: ?MeasureEnhanced
-}; */
-
-export default class MeasureContentContainer extends React.PureComponent {
- /*:: mounted: boolean; */
- /*:: props: Props; */
- state /*: State */ = {
- component: null,
- loading: {
- measure: false,
- components: false
- },
- measure: null,
- secondaryMeasure: null
- };
-
- componentDidMount() {
- this.mounted = true;
- this.fetchMeasure(this.props);
- }
-
- componentWillReceiveProps(nextProps /*: Props */) {
- const { component } = this.state;
- const componentChanged =
- !component ||
- nextProps.rootComponent.key !== component.key ||
- nextProps.selected !== component.key;
- if (componentChanged || nextProps.metric !== this.props.metric) {
- this.fetchMeasure(nextProps);
- }
- }
-
- componentWillUnmount() {
- this.mounted = false;
- }
-
- fetchMeasure = ({ branchLike, rootComponent, fetchMeasures, metric, selected } /*: Props */) => {
- this.updateLoading({ measure: true });
-
- const metricKeys = [metric.key];
- if (metric.key === 'ncloc') {
- metricKeys.push('ncloc_language_distribution');
- }
-
- fetchMeasures(selected || rootComponent.key, metricKeys, branchLike).then(
- ({ component, measures }) => {
- if (this.mounted) {
- const measure = measures.find(measure => measure.metric.key === metric.key);
- const secondaryMeasure = measures.find(measure => measure.metric.key !== metric.key);
- this.setState({ component, measure, secondaryMeasure });
- this.updateLoading({ measure: false });
- }
- },
- () => this.updateLoading({ measure: false })
- );
- };
-
- updateLoading = (loading /*: { [string]: boolean } */) => {
- if (this.mounted) {
- this.setState(state => ({ loading: { ...state.loading, ...loading } }));
- }
- };
-
- updateSelected = (component /*: string */) =>
- this.props.updateQuery({
- selected: component !== this.props.rootComponent.key ? component : null
- });
-
- updateView = (view /*: string */) => this.props.updateQuery({ view });
-
- render() {
- if (!this.state.component) {
- return null;
- }
-
- return (
- <MeasureContent
- branchLike={this.props.branchLike}
- className={this.props.className}
- component={this.state.component}
- currentUser={this.props.currentUser}
- leakPeriod={this.props.leakPeriod}
- loading={this.state.loading.measure || this.state.loading.components}
- measure={this.state.measure}
- metric={this.props.metric}
- metrics={this.props.metrics}
- rootComponent={this.props.rootComponent}
- router={this.props.router}
- secondaryMeasure={this.state.secondaryMeasure}
- updateLoading={this.updateLoading}
- updateSelected={this.updateSelected}
- updateView={this.updateView}
- view={this.props.view}
- />
- );
- }
-}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import * as React from 'react';
+import { InjectedRouter } from 'react-router';
+import MeasureContent from './MeasureContent';
+import { Query } from '../utils';
+import {
+ ComponentMeasure,
+ Metric,
+ BranchLike,
+ CurrentUser,
+ MeasureEnhanced
+} from '../../../app/types';
+import { Period } from '../../../helpers/periods';
+
+interface Props {
+ branchLike?: BranchLike;
+ className?: string;
+ currentUser: CurrentUser;
+ rootComponent: ComponentMeasure;
+ fetchMeasures: (
+ component: string,
+ metricsKey: string[],
+ branchLike?: BranchLike
+ ) => Promise<{ component: ComponentMeasure; measures: MeasureEnhanced[] }>;
+ leakPeriod?: Period;
+ metric: Metric;
+ metrics: { [metric: string]: Metric };
+ router: InjectedRouter;
+ selected?: string;
+ updateQuery: (query: Partial<Query>) => void;
+ view: string;
+}
+
+interface LoadingState {
+ measure: boolean;
+ components: boolean;
+ moreComponents: boolean;
+}
+
+interface State {
+ component?: ComponentMeasure;
+ loading: LoadingState;
+ measure?: MeasureEnhanced;
+ secondaryMeasure?: MeasureEnhanced;
+}
+
+export default class MeasureContentContainer extends React.PureComponent<Props, State> {
+ mounted = false;
+ state: State = { loading: { measure: false, components: false, moreComponents: false } };
+
+ componentDidMount() {
+ this.mounted = true;
+ this.fetchMeasure(this.props);
+ }
+
+ componentWillReceiveProps(nextProps: Props) {
+ const { component } = this.state;
+ const componentChanged =
+ !component ||
+ nextProps.rootComponent.key !== component.key ||
+ nextProps.selected !== component.key;
+ if (componentChanged || nextProps.metric !== this.props.metric) {
+ this.fetchMeasure(nextProps);
+ }
+ }
+
+ componentWillUnmount() {
+ this.mounted = false;
+ }
+
+ fetchMeasure = ({ branchLike, rootComponent, fetchMeasures, metric, selected }: Props) => {
+ this.updateLoading({ measure: true });
+
+ const metricKeys = [metric.key];
+ if (metric.key === 'ncloc') {
+ metricKeys.push('ncloc_language_distribution');
+ }
+
+ fetchMeasures(selected || rootComponent.key, metricKeys, branchLike).then(
+ ({ component, measures }) => {
+ if (this.mounted) {
+ const measure = measures.find(measure => measure.metric.key === metric.key);
+ const secondaryMeasure = measures.find(measure => measure.metric.key !== metric.key);
+ this.setState({ component, measure, secondaryMeasure });
+ this.updateLoading({ measure: false });
+ }
+ },
+ () => this.updateLoading({ measure: false })
+ );
+ };
+
+ updateLoading = (loading: Partial<LoadingState>) => {
+ if (this.mounted) {
+ this.setState(state => ({ loading: { ...state.loading, ...loading } }));
+ }
+ };
+
+ updateSelected = (component: string) => {
+ this.props.updateQuery({
+ selected: component !== this.props.rootComponent.key ? component : undefined
+ });
+ };
+
+ updateView = (view: string) => this.props.updateQuery({ view });
+
+ render() {
+ if (!this.state.component) {
+ return null;
+ }
+
+ return (
+ <MeasureContent
+ branchLike={this.props.branchLike}
+ className={this.props.className}
+ component={this.state.component}
+ currentUser={this.props.currentUser}
+ leakPeriod={this.props.leakPeriod}
+ loading={this.state.loading.measure || this.state.loading.components}
+ loadingMore={this.state.loading.moreComponents}
+ measure={this.state.measure}
+ metric={this.props.metric}
+ metrics={this.props.metrics}
+ rootComponent={this.props.rootComponent}
+ router={this.props.router}
+ secondaryMeasure={this.state.secondaryMeasure}
+ updateLoading={this.updateLoading}
+ updateSelected={this.updateSelected}
+ updateView={this.updateView}
+ view={this.props.view}
+ />
+ );
+ }
+}
},
Coverage: { x: 'complexity', y: 'coverage', size: 'uncovered_lines', yDomain: [100, 0] },
Duplications: { x: 'ncloc', y: 'duplicated_lines', size: 'duplicated_blocks' },
- // eslint-disable-next-line
+ // eslint-disable-next-line camelcase
project_overview: {
x: 'sqale_index',
y: 'coverage',
import ComponentsListRow from './ComponentsListRow';
import EmptyResult from './EmptyResult';
import { complementary } from '../config/complementary';
-import { getLocalizedMetricName, translate, translateWithParameters } from '../../../helpers/l10n';
-import { formatMeasure, isDiffMetric, isPeriodBestValue } from '../../../helpers/measures';
+import { getLocalizedMetricName } from '../../../helpers/l10n';
import { ComponentMeasure, ComponentMeasureEnhanced, Metric, BranchLike } from '../../../app/types';
-import { Button } from '../../../components/ui/buttons';
interface Props {
- bestValue?: string;
branchLike?: BranchLike;
components: ComponentMeasureEnhanced[];
onClick: (component: string) => void;
selectedComponent?: string;
}
-interface State {
- hideBest: boolean;
-}
-
-export default class ComponentsList extends React.PureComponent<Props, State> {
- state: State = { hideBest: true };
-
- componentWillReceiveProps(nextProps: Props) {
- if (nextProps.metric !== this.props.metric) {
- this.setState({ hideBest: true });
- }
+export default function ComponentsList({ components, metric, metrics, ...props }: Props) {
+ if (!components.length) {
+ return <EmptyResult />;
}
- displayAll = () => {
- this.setState({ hideBest: false });
- };
-
- hasBestValue = (component: ComponentMeasureEnhanced) => {
- const { metric } = this.props;
- const focusedMeasure = component.measures.find(measure => measure.metric.key === metric.key);
- if (focusedMeasure && isDiffMetric(focusedMeasure.metric.key)) {
- return isPeriodBestValue(focusedMeasure, 1);
- }
- return Boolean(focusedMeasure && focusedMeasure.bestValue);
- };
-
- renderHiddenLink = (hiddenCount: number) => {
- return (
- <div className="alert alert-info spacer-top">
- {translateWithParameters(
- 'component_measures.hidden_best_score_metrics',
- hiddenCount,
- formatMeasure(this.props.bestValue, this.props.metric.type)
- )}
- <Button className="button-link spacer-left" onClick={this.displayAll}>
- {translate('show_all')}
- </Button>
- </div>
- );
- };
-
- render() {
- const { components, metric, metrics } = this.props;
- if (!components.length) {
- return <EmptyResult />;
- }
-
- const otherMetrics = (complementary[metric.key] || []).map(key => metrics[key]);
- const notBestComponents = components.filter(component => !this.hasBestValue(component));
- const hiddenCount = components.length - notBestComponents.length;
- const shouldHideBest = this.state.hideBest && hiddenCount !== components.length;
- return (
- <React.Fragment>
- <table className="data zebra zebra-hover">
- {otherMetrics.length > 0 && (
- <thead>
- <tr>
- <th> </th>
- <th className="text-right">
+ const otherMetrics = (complementary[metric.key] || []).map(key => metrics[key]);
+ return (
+ <React.Fragment>
+ <table className="data zebra zebra-hover">
+ {otherMetrics.length > 0 && (
+ <thead>
+ <tr>
+ <th> </th>
+ <th className="text-right">
+ <span className="small">{getLocalizedMetricName(metric)}</span>
+ </th>
+ {otherMetrics.map(metric => (
+ <th className="text-right" key={metric.key}>
<span className="small">{getLocalizedMetricName(metric)}</span>
</th>
- {otherMetrics.map(metric => (
- <th className="text-right" key={metric.key}>
- <span className="small">{getLocalizedMetricName(metric)}</span>
- </th>
- ))}
- </tr>
- </thead>
- )}
+ ))}
+ </tr>
+ </thead>
+ )}
- <tbody>
- {(shouldHideBest ? notBestComponents : components).map(component => (
- <ComponentsListRow
- branchLike={this.props.branchLike}
- component={component}
- isSelected={component.key === this.props.selectedComponent}
- key={component.key}
- metric={metric}
- onClick={this.props.onClick}
- otherMetrics={otherMetrics}
- rootComponent={this.props.rootComponent}
- />
- ))}
- </tbody>
- </table>
- {shouldHideBest && hiddenCount > 0 && this.renderHiddenLink(hiddenCount)}
- </React.Fragment>
- );
- }
+ <tbody>
+ {components.map(component => (
+ <ComponentsListRow
+ component={component}
+ isSelected={component.key === props.selectedComponent}
+ key={component.key}
+ metric={metric}
+ otherMetrics={otherMetrics}
+ {...props}
+ />
+ ))}
+ </tbody>
+ </table>
+ </React.Fragment>
+ );
}
import { throttle } from 'lodash';
import ComponentsList from './ComponentsList';
import ListFooter from '../../../components/controls/ListFooter';
-import { scrollToElement } from '../../../helpers/scrolling';
+import { Button } from '../../../components/ui/buttons';
import {
ComponentMeasure,
ComponentMeasureEnhanced,
Paging,
BranchLike
} from '../../../app/types';
+import { translate, translateWithParameters } from '../../../helpers/l10n';
+import { isPeriodBestValue, isDiffMetric, formatMeasure } from '../../../helpers/measures';
+import { scrollToElement } from '../../../helpers/scrolling';
interface Props {
- bestValue?: string;
branchLike?: BranchLike;
components: ComponentMeasureEnhanced[];
fetchMore: () => void;
handleSelect: (component: string) => void;
handleOpen: (component: string) => void;
+ loadingMore: boolean;
metric: Metric;
metrics: { [metric: string]: Metric };
paging?: Paging;
selectedIdx?: number;
}
-export default class ListView extends React.PureComponent<Props> {
+interface State {
+ showBestMeasures: boolean;
+}
+
+export default class ListView extends React.PureComponent<Props, State> {
listContainer?: HTMLElement | null;
constructor(props: Props) {
super(props);
+ this.state = { showBestMeasures: false };
this.selectNext = throttle(this.selectNext, 100);
this.selectPrevious = throttle(this.selectPrevious, 100);
}
if (this.props.selectedKey !== undefined && prevProps.selectedKey !== this.props.selectedKey) {
this.scrollToElement();
}
+ if (prevProps.metric.key !== this.props.metric.key) {
+ this.setState({ showBestMeasures: false });
+ }
}
componentWillUnmount() {
['up', 'down', 'right'].forEach(action => key.unbind(action, 'measures-files'));
}
+ getVisibleComponents = (components: ComponentMeasureEnhanced[], showBestMeasures: boolean) => {
+ if (showBestMeasures) {
+ return components;
+ }
+ const filtered = components.filter(component => !this.hasBestValue(component));
+ if (filtered.length === 0) {
+ return components;
+ }
+ return filtered;
+ };
+
+ handleShowBestMeasures = () => {
+ this.setState({ showBestMeasures: true });
+ };
+
+ hasBestValue = (component: ComponentMeasureEnhanced) => {
+ const { metric } = this.props;
+ const focusedMeasure = component.measures.find(measure => measure.metric.key === metric.key);
+ if (focusedMeasure && isDiffMetric(metric.key)) {
+ return isPeriodBestValue(focusedMeasure, 1);
+ }
+ return Boolean(focusedMeasure && focusedMeasure.bestValue);
+ };
+
openSelected = () => {
if (this.props.selectedKey !== undefined) {
this.props.handleOpen(this.props.selectedKey);
};
selectPrevious = () => {
- const { selectedIdx } = this.props;
+ const { components, selectedIdx } = this.props;
+ const visibleComponents = this.getVisibleComponents(components, this.state.showBestMeasures);
if (selectedIdx !== undefined && selectedIdx > 0) {
- this.props.handleSelect(this.props.components[selectedIdx - 1].key);
+ this.props.handleSelect(visibleComponents[selectedIdx - 1].key);
} else {
- this.props.handleSelect(this.props.components[this.props.components.length - 1].key);
+ this.props.handleSelect(visibleComponents[visibleComponents.length - 1].key);
}
};
selectNext = () => {
- const { selectedIdx } = this.props;
- if (selectedIdx !== undefined && selectedIdx < this.props.components.length - 1) {
- this.props.handleSelect(this.props.components[selectedIdx + 1].key);
+ const { components, selectedIdx } = this.props;
+ const visibleComponents = this.getVisibleComponents(components, this.state.showBestMeasures);
+ if (selectedIdx !== undefined && selectedIdx < visibleComponents.length - 1) {
+ this.props.handleSelect(visibleComponents[selectedIdx + 1].key);
} else {
- this.props.handleSelect(this.props.components[0].key);
+ this.props.handleSelect(visibleComponents[0].key);
}
};
};
render() {
+ const { components } = this.props;
+ const filteredComponents = this.getVisibleComponents(components, this.state.showBestMeasures);
+ const hidingBestMeasures = filteredComponents.length < components.length;
return (
<div ref={elem => (this.listContainer = elem)}>
<ComponentsList
- bestValue={this.props.bestValue}
branchLike={this.props.branchLike}
- components={this.props.components}
+ components={filteredComponents}
metric={this.props.metric}
metrics={this.props.metrics}
onClick={this.props.handleOpen}
rootComponent={this.props.rootComponent}
selectedComponent={this.props.selectedKey}
/>
- {this.props.paging &&
+ {hidingBestMeasures && (
+ <div className="alert alert-info spacer-top">
+ {translateWithParameters(
+ 'component_measures.hidden_best_score_metrics',
+ components.length - filteredComponents.length,
+ formatMeasure(this.props.metric.bestValue, this.props.metric.type)
+ )}
+ <Button className="button-link spacer-left" onClick={this.handleShowBestMeasures}>
+ {translate('show_all')}
+ </Button>
+ </div>
+ )}
+ {!hidingBestMeasures &&
+ this.props.paging &&
this.props.components.length > 0 && (
<ListFooter
count={this.props.components.length}
loadMore={this.props.fetchMore}
+ loading={this.props.loadingMore}
total={this.props.paging.total}
/>
)}
}
const colorValue =
colorMeasure && (isDiffMetric(metric.key) ? colorMeasure.leak : colorMeasure.value);
- const sizeValue = Number(
- isDiffMetric(sizeMeasure.metric.key) ? sizeMeasure.leak : sizeMeasure.value
- );
- if (isNaN(sizeValue)) {
+ const rawSizeValue = isDiffMetric(sizeMeasure.metric.key)
+ ? sizeMeasure.leak
+ : sizeMeasure.value;
+ if (rawSizeValue === undefined) {
return undefined;
}
+ const sizeValue = Number(rawSizeValue);
return {
color:
colorValue !== undefined ? (colorScale as Function)(colorValue) : theme.secondFontColor,
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+/* eslint-disable camelcase */
+import * as React from 'react';
+import { shallow } from 'enzyme';
+import ComponentsList from '../ComponentsList';
+
+const COMPONENTS = [
+ {
+ key: 'foo',
+ measures: [],
+ name: 'Foo',
+ organization: 'foo',
+ qualifier: 'TRK'
+ }
+];
+
+const METRICS = {
+ coverage: { id: '1', key: 'coverage', type: 'PERCENT', name: 'Coverage' },
+ new_bugs: { id: '2', key: 'new_bugs', type: 'INT', name: 'New Bugs' },
+ uncovered_lines: { id: '3', key: 'uncovered_lines', type: 'INT', name: 'Lines' },
+ uncovered_conditions: { id: '4', key: 'uncovered_conditions', type: 'INT', name: 'Conditions' }
+};
+
+it('should renders correctly', () => {
+ expect(
+ shallow(
+ <ComponentsList
+ components={COMPONENTS}
+ metric={METRICS.new_bugs}
+ metrics={METRICS}
+ onClick={jest.fn()}
+ rootComponent={COMPONENTS[0]}
+ />
+ )
+ ).toMatchSnapshot();
+});
+
+it('should renders empty', () => {
+ expect(
+ shallow(
+ <ComponentsList
+ components={[]}
+ metric={METRICS.new_bugs}
+ metrics={METRICS}
+ onClick={jest.fn()}
+ rootComponent={COMPONENTS[0]}
+ />
+ )
+ ).toMatchSnapshot();
+});
+
+it('should renders with multiple measures', () => {
+ expect(
+ shallow(
+ <ComponentsList
+ components={COMPONENTS}
+ metric={METRICS.coverage}
+ metrics={METRICS}
+ onClick={jest.fn()}
+ rootComponent={COMPONENTS[0]}
+ />
+ )
+ ).toMatchSnapshot();
+});
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+/* eslint-disable camelcase */
+import * as React from 'react';
+import { shallow } from 'enzyme';
+import FilesView from '../FilesView';
+
+const COMPONENTS = [
+ {
+ key: 'foo',
+ measures: [],
+ name: 'Foo',
+ organization: 'foo',
+ qualifier: 'TRK'
+ }
+];
+
+const METRICS = { coverage: { id: '1', key: 'coverage', type: 'PERCENT', name: 'Coverage' } };
+
+it('should renders correctly', () => {
+ expect(getWrapper()).toMatchSnapshot();
+});
+
+it('should render with best values hidden', () => {
+ expect(
+ getWrapper({
+ components: [
+ ...COMPONENTS,
+ {
+ key: 'bar',
+ measures: [{ bestValue: true, metric: { key: 'coverage' } }],
+ name: 'Bar',
+ organization: 'foo',
+ qualifier: 'TRK'
+ }
+ ]
+ })
+ ).toMatchSnapshot();
+});
+
+function getWrapper(props = {}) {
+ return shallow(
+ <FilesView
+ components={COMPONENTS}
+ fetchMore={jest.fn()}
+ handleOpen={jest.fn()}
+ handleSelect={jest.fn()}
+ loadingMore={false}
+ metric={METRICS.coverage}
+ metrics={METRICS}
+ paging={{ pageIndex: 0, pageSize: 5, total: 10 }}
+ rootComponent={{
+ key: 'parent',
+ measures: [],
+ name: 'Parent',
+ organization: 'foo',
+ qualifier: 'TRK'
+ }}
+ {...props}
+ />
+ );
+}
--- /dev/null
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should renders correctly 1`] = `
+<React.Fragment>
+ <table
+ className="data zebra zebra-hover"
+ >
+ <tbody>
+ <ComponentsListRow
+ component={
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ isSelected={false}
+ key="foo"
+ metric={
+ Object {
+ "id": "2",
+ "key": "new_bugs",
+ "name": "New Bugs",
+ "type": "INT",
+ }
+ }
+ onClick={[MockFunction]}
+ otherMetrics={Array []}
+ rootComponent={
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ />
+ </tbody>
+ </table>
+</React.Fragment>
+`;
+
+exports[`should renders empty 1`] = `<EmptyResult />`;
+
+exports[`should renders with multiple measures 1`] = `
+<React.Fragment>
+ <table
+ className="data zebra zebra-hover"
+ >
+ <thead>
+ <tr>
+ <th>
+
+ </th>
+ <th
+ className="text-right"
+ >
+ <span
+ className="small"
+ >
+ Coverage
+ </span>
+ </th>
+ <th
+ className="text-right"
+ key="uncovered_lines"
+ >
+ <span
+ className="small"
+ >
+ Lines
+ </span>
+ </th>
+ <th
+ className="text-right"
+ key="uncovered_conditions"
+ >
+ <span
+ className="small"
+ >
+ Conditions
+ </span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <ComponentsListRow
+ component={
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ isSelected={false}
+ key="foo"
+ metric={
+ Object {
+ "id": "1",
+ "key": "coverage",
+ "name": "Coverage",
+ "type": "PERCENT",
+ }
+ }
+ onClick={[MockFunction]}
+ otherMetrics={
+ Array [
+ Object {
+ "id": "3",
+ "key": "uncovered_lines",
+ "name": "Lines",
+ "type": "INT",
+ },
+ Object {
+ "id": "4",
+ "key": "uncovered_conditions",
+ "name": "Conditions",
+ "type": "INT",
+ },
+ ]
+ }
+ rootComponent={
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ />
+ </tbody>
+ </table>
+</React.Fragment>
+`;
--- /dev/null
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render with best values hidden 1`] = `
+<div>
+ <ComponentsList
+ components={
+ Array [
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ },
+ ]
+ }
+ metric={
+ Object {
+ "id": "1",
+ "key": "coverage",
+ "name": "Coverage",
+ "type": "PERCENT",
+ }
+ }
+ metrics={
+ Object {
+ "coverage": Object {
+ "id": "1",
+ "key": "coverage",
+ "name": "Coverage",
+ "type": "PERCENT",
+ },
+ }
+ }
+ onClick={[MockFunction]}
+ rootComponent={
+ Object {
+ "key": "parent",
+ "measures": Array [],
+ "name": "Parent",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ />
+ <div
+ className="alert alert-info spacer-top"
+ >
+ component_measures.hidden_best_score_metrics.1.
+ <Button
+ className="button-link spacer-left"
+ onClick={[Function]}
+ >
+ show_all
+ </Button>
+ </div>
+</div>
+`;
+
+exports[`should renders correctly 1`] = `
+<div>
+ <ComponentsList
+ components={
+ Array [
+ Object {
+ "key": "foo",
+ "measures": Array [],
+ "name": "Foo",
+ "organization": "foo",
+ "qualifier": "TRK",
+ },
+ ]
+ }
+ metric={
+ Object {
+ "id": "1",
+ "key": "coverage",
+ "name": "Coverage",
+ "type": "PERCENT",
+ }
+ }
+ metrics={
+ Object {
+ "coverage": Object {
+ "id": "1",
+ "key": "coverage",
+ "name": "Coverage",
+ "type": "PERCENT",
+ },
+ }
+ }
+ onClick={[MockFunction]}
+ rootComponent={
+ Object {
+ "key": "parent",
+ "measures": Array [],
+ "name": "Parent",
+ "organization": "foo",
+ "qualifier": "TRK",
+ }
+ }
+ />
+ <ListFooter
+ count={1}
+ loadMore={[MockFunction]}
+ loading={false}
+ total={10}
+ />
+</div>
+`;
import { domains } from './config/domains';
import { bubbles } from './config/bubbles';
import { getLocalizedMetricName } from '../../helpers/l10n';
-import { ComponentMeasure, ComponentMeasureEnhanced, Metric } from '../../app/types';
+import {
+ ComponentMeasure,
+ ComponentMeasureEnhanced,
+ Metric,
+ MeasureEnhanced
+} from '../../app/types';
import { enhanceMeasure } from '../../components/measure/utils';
import { cleanQuery, parseAsString, RawQuery, serializeString } from '../../helpers/query';
-import { MeasureEnhanced } from '../../helpers/measures';
export const PROJECT_OVERVEW = 'project_overview';
export const DEFAULT_VIEW = 'list';
import { getMeasuresAndMeta } from '../../../api/measures';
import { getAllTimeMachineData, History } from '../../../api/time-machine';
import { parseDate } from '../../../helpers/dates';
-import { enhanceMeasuresWithMetrics, MeasureEnhanced } from '../../../helpers/measures';
+import { enhanceMeasuresWithMetrics } from '../../../helpers/measures';
import { getLeakPeriod, Period } from '../../../helpers/periods';
import { get } from '../../../helpers/storage';
import { METRICS, HISTORY_METRICS_LIST } from '../utils';
} from '../../../helpers/branches';
import { fetchMetrics } from '../../../store/rootActions';
import { getMetrics } from '../../../store/rootReducer';
-import { BranchLike, Component, Metric } from '../../../app/types';
+import { BranchLike, Component, Metric, MeasureEnhanced } from '../../../app/types';
import { translate } from '../../../helpers/l10n';
import '../styles.css';
isDiffMetric,
getPeriodValue,
getShortType,
- getRatingTooltip,
- MeasureEnhanced
+ getRatingTooltip
} from '../../../helpers/measures';
import { getLocalizedMetricName } from '../../../helpers/l10n';
import { getPeriodDate } from '../../../helpers/periods';
getComponentIssuesUrl,
getMeasureHistoryUrl
} from '../../../helpers/urls';
-import { Component, BranchLike } from '../../../app/types';
+import { Component, BranchLike, MeasureEnhanced } from '../../../app/types';
import { History } from '../../../api/time-machine';
import { getBranchLikeQuery } from '../../../helpers/branches';
Metric,
BranchLike,
CurrentUser,
- Organization
+ Organization,
+ MeasureEnhanced
} from '../../../app/types';
import { History } from '../../../api/time-machine';
import { translate } from '../../../helpers/l10n';
-import { MeasureEnhanced } from '../../../helpers/measures';
import { hasPrivateAccess } from '../../../helpers/organizations';
import {
getCurrentUser,
import DrilldownLink from '../../../components/shared/DrilldownLink';
import LanguageDistributionContainer from '../../../components/charts/LanguageDistributionContainer';
import SizeRating from '../../../components/ui/SizeRating';
-import { formatMeasure, MeasureEnhanced } from '../../../helpers/measures';
+import { formatMeasure } from '../../../helpers/measures';
import { getMetricName } from '../helpers/metrics';
import { translate } from '../../../helpers/l10n';
-import { LightComponent, BranchLike } from '../../../app/types';
+import { LightComponent, BranchLike, MeasureEnhanced } from '../../../app/types';
interface Props {
branchLike?: BranchLike;
import { getFacets } from '../../../api/issues';
import { getMeasures } from '../../../api/measures';
import { getAllMetrics } from '../../../api/metrics';
-import { FacetValue, SourceViewerFile, BranchLike } from '../../../app/types';
+import { FacetValue, SourceViewerFile, BranchLike, MeasureEnhanced } from '../../../app/types';
import Modal from '../../controls/Modal';
import Measure from '../../measure/Measure';
import QualifierIcon from '../../icons-components/QualifierIcon';
import { translate, getLocalizedMetricName } from '../../../helpers/l10n';
import {
formatMeasure,
- MeasureEnhanced,
getDisplayMetrics,
enhanceMeasuresWithMetrics
} from '../../../helpers/measures';
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import {
- getRatingTooltip as nextGetRatingTooltip,
- isDiffMetric,
- Measure,
- MeasureEnhanced
-} from '../../helpers/measures';
-import { Metric } from '../../app/types';
+import { getRatingTooltip as nextGetRatingTooltip, isDiffMetric } from '../../helpers/measures';
+import { Metric, Measure, MeasureEnhanced } from '../../app/types';
const KNOWN_RATINGS = ['sqale_rating', 'reliability_rating', 'security_rating'];
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import { translate, translateWithParameters, getCurrentLocale } from './l10n';
-import { Metric } from '../app/types';
+import { Metric, Measure, MeasureEnhanced } from '../app/types';
const HOURS_IN_DAY = 8;
-export interface MeasurePeriod {
- bestValue?: boolean;
- index: number;
- value: string;
-}
-
-export interface MeasureIntern {
- bestValue?: boolean;
- periods?: MeasurePeriod[];
- value?: string;
-}
-
-export interface Measure extends MeasureIntern {
- metric: string;
-}
-
-export interface MeasureEnhanced extends MeasureIntern {
- metric: Metric;
- leak?: string;
-}
-
interface Formatter {
(value: string | number, options?: any): string;
}
projects / sonarqube.git / commitdiff