import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import throwGlobalError from '../app/utils/throwGlobalError';
-export function fetchQualityGatesAppDetails(): Promise<any> {
- return getJSON('/api/qualitygates/app').catch(throwGlobalError);
+interface Condition {
+ error?: string;
+ id: number;
+ metric: string;
+ op: string;
+ period?: number;
+ warning?: string;
}
export interface QualityGate {
+ actions?: {
+ associateProjects: boolean;
+ copy: boolean;
+ edit: boolean;
+ setAsDefault: boolean;
+ };
+ conditions?: Condition[];
+ id: number;
isBuiltIn?: boolean;
isDefault?: boolean;
- id: number;
name: string;
}
-export function fetchQualityGates(): Promise<QualityGate[]> {
- return getJSON('/api/qualitygates/list').then(
- r =>
- r.qualitygates.map((qualityGate: any) => {
- return {
- ...qualityGate,
- id: qualityGate.id,
- isDefault: qualityGate.id === r.default
- };
- }),
- throwGlobalError
- );
+export function fetchQualityGates(): Promise<{
+ actions: { create: boolean };
+ qualitygates: QualityGate[];
+}> {
+ return getJSON('/api/qualitygates/list').catch(throwGlobalError);
}
-export function fetchQualityGate(id: string): Promise<any> {
+export function fetchQualityGate(id: string): Promise<QualityGate> {
return getJSON('/api/qualitygates/show', { id }).catch(throwGlobalError);
}
export function getGateForProject(project: string): Promise<QualityGate | undefined> {
return getJSON('/api/qualitygates/get_by_project', { project }).then(
- r =>
- r.qualityGate && {
- id: r.qualityGate.id,
- isDefault: r.qualityGate.default,
- name: r.qualityGate.name
+ ({ qualityGate }) =>
+ qualityGate && {
+ ...qualityGate,
+ isDefault: qualityGate.default
}
);
}
fetchQualityGates() {
this.setState({ loading: true });
Promise.all([fetchQualityGates(), getGateForProject(this.props.component.key)]).then(
- ([allGates, gate]) => {
+ ([{ qualitygates: allGates }, gate]) => {
if (this.mounted) {
this.setState({ allGates, gate, loading: false });
}
jest.mock('../../../api/quality-gates', () => ({
associateGateWithProject: jest.fn(() => Promise.resolve()),
dissociateGateWithProject: jest.fn(() => Promise.resolve()),
- fetchQualityGates: jest.fn(),
- getGateForProject: jest.fn()
+ fetchQualityGates: jest.fn(() => Promise.resolve({})),
+ getGateForProject: jest.fn(() => Promise.resolve())
}));
jest.mock('../../../app/utils/addGlobalSuccessMessage', () => ({
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import React from 'react';
-import { sortBy } from 'lodash';
+import { omitBy, map, sortBy } from 'lodash';
import Select from '../../../components/controls/Select';
import { translate, getLocalizedMetricName, getLocalizedMetricDomain } from '../../../helpers/l10n';
onSelect(metric);
}
- const metricsToDisplay = metrics.filter(metric => !metric.hidden);
- const sortedMetrics = sortBy(metricsToDisplay, 'domain');
- const options = sortedMetrics.map(metric => {
- return {
+ const metricsToDisplay = omitBy(metrics, metric => metric.hidden);
+ const options = sortBy(
+ map(metricsToDisplay, metric => ({
value: metric.key,
label: getLocalizedMetricName(metric),
domain: metric.domain
- };
- });
+ })),
+ 'domain'
+ );
// use "disabled" property to emulate optgroups
const optionsWithDomains = [];
onDeleteCondition
} = this.props;
- const existingConditions = conditions.filter(condition =>
- metrics.find(metric => metric.key === condition.metric)
- );
+ const existingConditions = conditions.filter(condition => metrics[condition.metric]);
const sortedConditions = sortBy(
existingConditions,
- condition => metrics.find(metric => metric.key === condition.metric).name
+ condition => metrics[condition.metric] && metrics[condition.metric].name
);
const duplicates = [];
}
});
- const uniqDuplicates = uniqBy(duplicates, d => d.metric).map(condition => {
- const metric = metrics.find(metric => metric.key === condition.metric);
- return { ...condition, metric };
- });
-
+ const uniqDuplicates = uniqBy(duplicates, d => d.metric).map(condition => ({
+ ...condition,
+ metric: metrics[condition.metric]
+ }));
return (
<div id="quality-gate-conditions" className="quality-gate-section">
<h3 className="spacer-bottom">{translate('quality_gates.conditions')}</h3>
key={getKey(condition, index)}
qualityGate={qualityGate}
condition={condition}
- metric={metrics.find(metric => metric.key === condition.metric)}
+ metric={metrics[condition.metric]}
edit={edit}
onSaveCondition={onSaveCondition}
onDeleteCondition={onDeleteCondition}
import { getQualityGatesUrl, getQualityGateUrl } from '../../../helpers/urls';
export default class Details extends React.PureComponent {
+ static contextTypes = {
+ router: PropTypes.object.isRequired
+ };
+
componentDidMount() {
+ this.props.fetchMetrics();
this.fetchDetails();
}
}
}
- fetchDetails() {
- const { id } = this.props.params;
- fetchQualityGate(id).then(qualityGate => this.props.onShow(qualityGate));
- }
+ fetchDetails = () =>
+ fetchQualityGate(this.props.params.id).then(
+ qualityGate => this.props.onShow(qualityGate),
+ () => {}
+ );
- handleRenameClick() {
+ handleRenameClick = () => {
const { qualityGate, onRename } = this.props;
-
new RenameView({
qualityGate,
onRename: (qualityGate, newName) => {
onRename(qualityGate, newName);
}
}).render();
- }
+ };
- handleCopyClick() {
+ handleCopyClick = () => {
const { qualityGate, onCopy, organization } = this.props;
const { router } = this.context;
-
new CopyView({
qualityGate,
onCopy: newQualityGate => {
router.push(getQualityGateUrl(newQualityGate.id, organization && organization.key));
}
}).render();
- }
+ };
- handleSetAsDefaultClick() {
+ handleSetAsDefaultClick = () => {
const { qualityGate, onSetAsDefault, onUnsetAsDefault } = this.props;
-
if (qualityGate.isDefault) {
unsetQualityGateAsDefault(qualityGate.id).then(() => onUnsetAsDefault(qualityGate));
} else {
setQualityGateAsDefault(qualityGate.id).then(() => onSetAsDefault(qualityGate));
}
- }
+ };
- handleDeleteClick() {
+ handleDeleteClick = () => {
const { qualityGate, onDelete, organization } = this.props;
const { router } = this.context;
new DeleteView({
router.replace(getQualityGatesUrl(organization && organization.key));
}
}).render();
- }
+ };
render() {
- const { qualityGate, edit, metrics } = this.props;
+ const { qualityGate, metrics } = this.props;
const { onAddCondition, onDeleteCondition, onSaveCondition } = this.props;
if (!qualityGate) {
<Helmet title={qualityGate.name} />
<DetailsHeader
qualityGate={qualityGate}
- edit={edit}
- onRename={this.handleRenameClick.bind(this)}
- onCopy={this.handleCopyClick.bind(this)}
- onSetAsDefault={this.handleSetAsDefaultClick.bind(this)}
- onDelete={this.handleDeleteClick.bind(this)}
+ onRename={this.handleRenameClick}
+ onCopy={this.handleCopyClick}
+ onSetAsDefault={this.handleSetAsDefaultClick}
+ onDelete={this.handleDeleteClick}
organization={this.props.organization}
/>
<DetailsContent
gate={qualityGate}
- canEdit={edit}
metrics={metrics}
onAddCondition={onAddCondition}
onSaveCondition={onSaveCondition}
);
}
}
-
-Details.contextTypes = {
- router: PropTypes.object.isRequired
-};
export default class DetailsContent extends React.PureComponent {
render() {
- const { gate, canEdit, metrics } = this.props;
+ const { gate, metrics } = this.props;
const { onAddCondition, onDeleteCondition, onSaveCondition } = this.props;
const conditions = gate.conditions || [];
+ const actions = gate.actions || {};
- const defaultMessage = canEdit
+ const defaultMessage = actions.associateProjects
? translate('quality_gates.projects_for_default.edit')
: translate('quality_gates.projects_for_default');
qualityGate={gate}
conditions={conditions}
metrics={metrics}
- edit={canEdit}
+ edit={actions.edit}
onAddCondition={onAddCondition}
onSaveCondition={onSaveCondition}
onDeleteCondition={onDeleteCondition}
<div id="quality-gate-projects" className="quality-gate-section">
<h3 className="spacer-bottom">{translate('quality_gates.projects')}</h3>
- {gate.isDefault ? defaultMessage : <Projects qualityGate={gate} edit={canEdit} />}
+ {gate.isDefault ? (
+ defaultMessage
+ ) : (
+ <Projects qualityGate={gate} edit={actions.associateProjects} />
+ )}
</div>
</div>
);
};
render() {
- const { qualityGate, edit } = this.props;
-
+ const { qualityGate } = this.props;
+ const actions = qualityGate.actions || {};
return (
<div className="layout-page-header-panel layout-page-main-header issues-main-header">
<div className="layout-page-header-panel-inner layout-page-main-header-inner">
{qualityGate.name}
{qualityGate.isBuiltIn && <BuiltInBadge className="spacer-left" tooltip={true} />}
</h2>
- {edit && (
- <div className="pull-right">
+
+ <div className="pull-right">
+ {actions.edit && (
<button id="quality-gate-rename" onClick={this.handleRenameClick}>
{translate('rename')}
</button>
+ )}
+ {actions.copy && (
<button
className="little-spacer-left"
id="quality-gate-copy"
onClick={this.handleCopyClick}>
{translate('copy')}
</button>
+ )}
+ {actions.setAsDefault && (
<button
className="little-spacer-left"
id="quality-gate-toggle-default"
? translate('unset_as_default')
: translate('set_as_default')}
</button>
+ )}
+ {actions.edit && (
<button
id="quality-gate-delete"
className="little-spacer-left button-red"
onClick={this.handleDeleteClick}>
{translate('delete')}
</button>
- </div>
- )}
+ )}
+ </div>
</div>
</div>
</div>
import ListHeader from './ListHeader';
import List from './List';
import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper';
-import {
- fetchQualityGatesAppDetails,
- fetchQualityGates as fetchQualityGatesAPI
-} from '../../../api/quality-gates';
+import { fetchQualityGates } from '../../../api/quality-gates';
import { translate } from '../../../helpers/l10n';
import { getQualityGateUrl } from '../../../helpers/urls';
import '../styles.css';
}
}
- fetchQualityGates() {
- Promise.all([
- fetchQualityGatesAppDetails(),
- fetchQualityGatesAPI()
- ]).then(([details, qualityGates]) => {
+ fetchQualityGates = () =>
+ fetchQualityGates().then(({ actions, qualitygates: qualityGates }) => {
const { organization, updateStore } = this.props;
- updateStore({ ...details, qualityGates });
- if (qualityGates && qualityGates.length === 1 && !details.edit) {
+ updateStore({ actions, qualityGates });
+ if (qualityGates && qualityGates.length === 1 && !actions.create) {
this.context.router.replace(
getQualityGateUrl(qualityGates[0].id, organization && organization.key)
);
}
});
- }
- handleAdd(qualityGate) {
+ handleAdd = qualityGate => {
const { addQualityGate, organization } = this.props;
const { router } = this.context;
addQualityGate(qualityGate);
router.push(getQualityGateUrl(qualityGate.id, organization && organization.key));
- }
+ };
render() {
- const { children, qualityGates, edit, organization } = this.props;
+ const { children, qualityGates, actions, organization } = this.props;
const defaultTitle = translate('quality_gates.page');
return (
<div id="quality-gates-page" className="layout-page">
<div className="layout-page-side" style={{ top }}>
<div className="layout-page-side-inner">
<div className="layout-page-filters">
- <ListHeader canEdit={edit} onAdd={this.handleAdd.bind(this)} />
+ <ListHeader canEdit={actions && actions.create} onAdd={this.handleAdd} />
{qualityGates && <List organization={organization} qualityGates={qualityGates} />}
</div>
</div>
saveCondition
} from '../store/actions';
import Details from '../components/Details';
-import { getQualityGatesAppState } from '../../../store/rootReducer';
+import { getMetrics, getQualityGatesAppState } from '../../../store/rootReducer';
+import { fetchMetrics } from '../../../store/rootActions';
-const mapStateToProps = state => getQualityGatesAppState(state);
+const mapStateToProps = state => ({
+ ...getQualityGatesAppState(state),
+ metrics: getMetrics(state)
+});
const mapDispatchToProps = dispatch => ({
onShow: qualityGate => dispatch(showQualityGate(qualityGate)),
onAddCondition: metric => dispatch(addCondition(metric)),
onSaveCondition: (oldCondition, newCondition) =>
dispatch(saveCondition(oldCondition, newCondition)),
- onDeleteCondition: condition => dispatch(deleteCondition(condition))
+ onDeleteCondition: condition => dispatch(deleteCondition(condition)),
+ fetchMetrics: () => dispatch(fetchMetrics())
});
export default connect(mapStateToProps, mapDispatchToProps)(Details);
projects / sonarqube.git / commitdiff