*/
import { getJSON } from '../helpers/request';
import { Metric } from '../app/types';
+import throwGlobalError from '../app/utils/throwGlobalError';
export function getMetrics(): Promise<Metric[]> {
return getJSON('/api/metrics/search', { ps: 9999 }).then(r => r.metrics);
}
+
+export function getMetricDomains(): Promise<string[]> {
+ return getJSON('/api/metrics/domains').then(r => r.domains, throwGlobalError);
+}
+
+export function getMetricTypes(): Promise<string[]> {
+ return getJSON('/api/metrics/types').then(r => r.types, throwGlobalError);
+}
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { getJSON, RequestData } from '../helpers/request';
+import { post, getJSON, RequestData } from '../helpers/request';
import throwGlobalError from '../app/utils/throwGlobalError';
export interface GetRulesAppResponse {
}
export function searchRules(data: RequestData) {
- return getJSON('/api/rules/search', data);
+ return getJSON('/api/rules/search', data).catch(throwGlobalError);
}
export function takeFacet(response: any, property: string) {
const facet = response.facets.find((facet: any) => facet.property === property);
return facet ? facet.values : [];
}
+
+export interface GetRuleDetailsParameters {
+ actives?: boolean;
+ key: string;
+ organization?: string;
+}
+
+export function getRuleDetails({ key }: GetRuleDetailsParameters): Promise<any> {
+ return getJSON('/api/rules/show', { key }).catch(throwGlobalError);
+}
+
+export function getRuleTags(parameters: { organization?: string }): Promise<string[]> {
+ return getJSON('/api/rules/tags', parameters).then(r => r.tags, throwGlobalError);
+}
+
+export function deleteRule({ key }: { key: string }) {
+ return post('/api/rules/delete', { key }).catch(throwGlobalError);
+}
--- /dev/null
+/*
+* SonarQube
+* Copyright (C) 2009-2016 SonarSource SA
+* mailto:contact 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 throwGlobalError from '../app/utils/throwGlobalError';
+import { getJSON } from '../helpers/request';
+
+export interface GetTestsParameters {
+ branch?: string;
+ testFileKey: string;
+}
+
+export function getTests(parameters: GetTestsParameters) {
+ return getJSON('/api/tests/list', parameters).catch(throwGlobalError);
+}
+
+export interface GetCoveredFilesParameters {
+ testId: string;
+}
+
+export function getCoveredFiles(parameters: GetCoveredFilesParameters) {
+ return getJSON('/api/tests/covered_files', parameters).catch(throwGlobalError);
+}
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import $ from 'jquery';
import ModalFormView from '../../components/common/modal-form';
import Template from './templates/coding-rules-bulk-change-modal.hbs';
import { translateWithParameters } from '../../helpers/l10n';
+import { postJSON } from '../../helpers/request';
export default ModalFormView.extend({
template: Template,
sendRequests(url, options, profiles) {
const that = this;
- let looper = $.Deferred().resolve();
+ let looper = Promise.resolve();
this.disableForm();
profiles.forEach(profile => {
const opts = { ...options, profile_key: profile };
- looper = looper.then(() => {
- return $.post(url, opts).done(r => {
+ looper = looper.then(() =>
+ postJSON(url, opts).then(r => {
if (!that.isDestroyed) {
if (r.failed) {
that.showWarnMessage(profile, r.succeeded, r.failed);
that.showSuccessMessage(profile, r.succeeded);
}
}
- });
- });
- });
- looper.done(() => {
- that.options.app.controller.fetchList();
- if (!that.isDestroyed) {
- that.$(that.ui.codingRulesSubmitBulkChange.selector).hide();
- that.enableForm();
- that.$('.modal-field').hide();
- that.$('.js-modal-close').focus();
- }
+ })
+ );
});
+ looper.then(
+ () => {
+ that.options.app.controller.fetchList();
+ if (!that.isDestroyed) {
+ that.$(that.ui.codingRulesSubmitBulkChange.selector).hide();
+ that.enableForm();
+ that.$('.modal-field').hide();
+ that.$('.js-modal-close').focus();
+ }
+ },
+ () => {}
+ );
},
getAvailableQualityProfiles() {
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import $ from 'jquery';
import key from 'keymaster';
import Controller from '../../components/navigator/controller';
import Rule from './models/rule';
import RuleDetailsView from './rule-details-view';
-import throwGlobalError from '../../app/utils/throwGlobalError';
+import { searchRules, getRuleDetails } from '../../api/rules';
export default Controller.extend({
pageSize: 200,
this.hideDetails(firstPage);
- const that = this;
- const url = window.baseUrl + '/api/rules/search';
const options = { ...this._searchParameters(), ...this.app.state.get('query') };
- return $.get(url, options)
- .done(r => {
- const rules = that.app.list.parseRules(r);
+ return searchRules(options).then(
+ r => {
+ const rules = this.app.list.parseRules(r);
if (firstPage) {
- that.app.list.reset(rules);
+ this.app.list.reset(rules);
} else {
- that.app.list.add(rules);
+ this.app.list.add(rules);
}
- that.app.list.setIndex();
- that.app.list.addExtraAttributes(that.app.repositories);
- that.app.facets.reset(that._allFacets());
- that.app.facets.add(r.facets, { merge: true });
- that.enableFacets(that._enabledFacets());
- that.app.state.set({
+ this.app.list.setIndex();
+ this.app.list.addExtraAttributes(this.app.repositories);
+ this.app.facets.reset(this._allFacets());
+ this.app.facets.add(r.facets, { merge: true });
+ this.enableFacets(this._enabledFacets());
+ this.app.state.set({
page: r.p,
pageSize: r.ps,
total: r.total,
maxResultsReached: r.p * r.ps >= r.total
});
- if (firstPage && that.isRulePermalink()) {
- that.showDetails(that.app.list.first());
+ if (firstPage && this.isRulePermalink()) {
+ this.showDetails(this.app.list.first());
}
- })
- .fail(error => {
+ },
+ () => {
this.app.state.set({ maxResultsReached: true });
- throwGlobalError(error);
- });
+ }
+ );
},
isRulePermalink() {
},
requestFacet(id) {
- const url = window.baseUrl + '/api/rules/search';
const facet = this.app.facets.get(id);
const options = { facets: id, ps: 1, ...this.app.state.get('query') };
- return $.get(url, options).done(r => {
+ return searchRules(options).then(r => {
const facetData = r.facets.find(facet => facet.property === id);
if (facetData) {
facet.set(facetData);
},
getRuleDetails(rule) {
- const that = this;
- const url = window.baseUrl + '/api/rules/show';
- const options = {
- key: rule.id,
- actives: true
- };
- if (this.app.organization) {
- options.organization = this.app.organization;
- }
- return $.get(url, options).done(data => {
- rule.set(data.rule);
- rule.addExtraAttributes(that.app.repositories);
+ const parameters = { key: rule.id, actives: true, organization: this.app.organization };
+ return getRuleDetails(parameters).then(r => {
+ rule.set(r.rule);
+ rule.addExtraAttributes(this.app.repositories);
+ return r;
});
},
const that = this;
const ruleModel = typeof rule === 'string' ? new Rule({ key: rule }) : rule;
this.app.layout.workspaceDetailsRegion.reset();
- this.getRuleDetails(ruleModel).done(data => {
- key.setScope('details');
- that.app.workspaceListView.unbindScrollEvents();
- that.app.state.set({ rule: ruleModel });
- that.app.workspaceDetailsView = new RuleDetailsView({
- app: that.app,
- model: ruleModel,
- actives: data.actives
- });
- that.app.layout.showDetails();
- that.app.layout.workspaceDetailsRegion.show(that.app.workspaceDetailsView);
- });
+ this.getRuleDetails(ruleModel).then(
+ r => {
+ key.setScope('details');
+ that.app.workspaceListView.unbindScrollEvents();
+ that.app.state.set({ rule: ruleModel });
+ that.app.workspaceDetailsView = new RuleDetailsView({
+ app: that.app,
+ model: ruleModel,
+ actives: r.actives
+ });
+ that.app.layout.showDetails();
+ that.app.layout.workspaceDetailsRegion.show(that.app.workspaceDetailsView);
+ },
+ () => {}
+ );
},
showDetailsForSelected() {
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import $ from 'jquery';
import { union } from 'lodash';
import Backbone from 'backbone';
import Marionette from 'backbone.marionette';
import DeleteRuleView from './rule/delete-rule-view';
import IssuesView from './rule/rule-issues-view';
import Template from './templates/coding-rules-rule-details.hbs';
+import { searchRules } from '../../api/rules';
export default Marionette.LayoutView.extend({
className: 'coding-rule-details',
},
fetchCustomRules() {
- const that = this;
- const url = window.baseUrl + '/api/rules/search';
const options = {
template_key: this.model.get('key'),
f: 'name,severity,params'
};
- return $.get(url, options).done(data => {
- that.customRules.reset(data.rules);
- });
+ searchRules(options).then(r => this.customRules.reset(r.rules), () => {});
},
getQualityProfiles() {
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import $ from 'jquery';
import ModalFormView from '../../../components/common/modal-form';
import Template from '../templates/rule/coding-rules-delete-rule.hbs';
+import { deleteRule } from '../../../api/rules';
export default ModalFormView.extend({
template: Template,
onFormSubmit() {
ModalFormView.prototype.onFormSubmit.apply(this, arguments);
-
- const url = window.baseUrl + '/api/rules/delete';
- const options = { key: this.model.id };
- $.post(url, options).done(() => {
- this.destroy();
- this.trigger('delete');
- });
+ deleteRule({ key: this.model.id }).then(
+ () => {
+ this.destroy();
+ this.trigger('delete');
+ },
+ () => {}
+ );
}
});
import Marionette from 'backbone.marionette';
import RuleFilterMixin from './rule-filter-mixin';
import Template from '../templates/rule/coding-rules-rule-meta.hbs';
+import { getRuleTags } from '../../../api/rules';
export default Marionette.ItemView.extend(RuleFilterMixin).extend({
template: Template,
this.$('[data-toggle="tooltip"]').tooltip('destroy');
},
- requestTags() {
- const url = window.baseUrl + '/api/rules/tags';
- const data = this.options.app.organization
- ? { organization: this.options.app.organization }
- : undefined;
- return $.get(url, data);
- },
-
changeTags() {
- const that = this;
- this.requestTags().done(r => {
- that.ui.tagInput.select2({
- tags: difference(difference(r.tags, that.model.get('tags')), that.model.get('sysTags')),
- width: '300px'
- });
+ getRuleTags({ organization: this.options.app.organization }).then(
+ tags => {
+ this.ui.tagInput.select2({
+ tags: difference(difference(tags, this.model.get('tags')), this.model.get('sysTags')),
+ width: '300px'
+ });
- that.ui.tagsEdit.removeClass('hidden');
- that.ui.tagsList.addClass('hidden');
- that.tagsBuffer = that.ui.tagInput.select2('val');
- that.ui.tagInput.select2('open');
- });
+ this.ui.tagsEdit.removeClass('hidden');
+ this.ui.tagsList.addClass('hidden');
+ this.tagsBuffer = this.ui.tagInput.select2('val');
+ this.ui.tagInput.select2('open');
+ },
+ () => {}
+ );
},
cancelEdit() {
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import $ from 'jquery';
import Marionette from 'backbone.marionette';
import Layout from './layout';
import Metrics from './metrics';
import HeaderView from './header-view';
import ListView from './list-view';
import ListFooterView from './list-footer-view';
+import { getMetricDomains, getMetricTypes } from '../../api/metrics';
const App = new Marionette.Application();
const init = function(el) {
this.metrics.fetch();
};
-App.requestDomains = function() {
- return $.get(window.baseUrl + '/api/metrics/domains').done(r => {
- App.domains = r.domains;
- });
-};
-App.requestTypes = function() {
- return $.get(window.baseUrl + '/api/metrics/types').done(r => {
- App.types = r.types;
- });
-};
-
App.on('start', el => {
- $.when(App.requestDomains(), App.requestTypes()).done(() => {
- init.call(App, el);
- });
+ Promise.all([getMetricDomains(), getMetricTypes()]).then(
+ ([domains, types]) => {
+ App.domains = domains;
+ App.types = types;
+ init.call(App, el);
+ },
+ () => {}
+ );
});
export default function(el) {
const requests = this.props.profiles.map(profile =>
this.loadDeprecatedRulesForProfile(profile.key)
);
- Promise.all(requests).then(responses => {
- if (this.mounted) {
- const deprecatedByKey = {};
- responses.forEach((count, i) => {
- const profileKey = this.props.profiles[i].key;
- deprecatedByKey[profileKey] = count;
- });
- this.setState({ deprecatedByKey });
- }
- });
+ Promise.all(requests).then(
+ responses => {
+ if (this.mounted) {
+ const deprecatedByKey = {};
+ responses.forEach((count, i) => {
+ const profileKey = this.props.profiles[i].key;
+ deprecatedByKey[profileKey] = count;
+ });
+ this.setState({ deprecatedByKey });
+ }
+ },
+ () => {}
+ );
}
loadDeprecatedRulesForProfile(profileKey) {
loadRules() {
this.setState({ loading: true });
- Promise.all([
- this.loadAllRules(),
- this.loadActivatedRules(),
- this.loadProfile()
- ]).then(responses => {
- if (this.mounted) {
- const [allRules, activatedRules, showProfile] = responses;
- this.setState({
- activatedTotal: activatedRules.total,
- allByType: keyBy<ByType>(takeFacet(allRules, 'types'), 'val'),
- activatedByType: keyBy<ByType>(takeFacet(activatedRules, 'types'), 'val'),
- compareToSonarWay: showProfile && showProfile.compareToSonarWay,
- loading: false,
- total: allRules.total
- });
+ Promise.all([this.loadAllRules(), this.loadActivatedRules(), this.loadProfile()]).then(
+ responses => {
+ if (this.mounted) {
+ const [allRules, activatedRules, showProfile] = responses;
+ this.setState({
+ activatedTotal: activatedRules.total,
+ allByType: keyBy<ByType>(takeFacet(allRules, 'types'), 'val'),
+ activatedByType: keyBy<ByType>(takeFacet(activatedRules, 'types'), 'val'),
+ compareToSonarWay: showProfile && showProfile.compareToSonarWay,
+ loading: false,
+ total: allRules.total
+ });
+ }
+ },
+ () => {
+ if (this.mounted) {
+ this.setState({ loading: false });
+ }
}
- });
+ );
}
getRulesCountForType(type: string) {
f: 'name,langName,actives'
};
- searchRules(data).then((r: any) => {
- if (this.mounted) {
- this.setState({
- latestRules: sortBy<Rule>(parseRules(r), 'langName'),
- latestRulesTotal: r.total
- });
- }
- });
+ searchRules(data).then(
+ (r: any) => {
+ if (this.mounted) {
+ this.setState({
+ latestRules: sortBy<Rule>(parseRules(r), 'langName'),
+ latestRulesTotal: r.total
+ });
+ }
+ },
+ () => {}
+ );
}
render() {
import { groupBy, sortBy, toPairs } from 'lodash';
import ModalView from '../../common/modals';
import Template from './templates/source-viewer-measures.hbs';
+import { searchIssues } from '../../../api/issues';
import { getMeasures } from '../../../api/measures';
import { getMetrics } from '../../../api/metrics';
+import { getTests, getCoveredFiles } from '../../../api/tests';
import { getLocalizedMetricName, getLocalizedMetricDomain } from '../../../helpers/l10n';
import { formatMeasure } from '../../../helpers/measures';
},
requestIssues() {
- return new Promise(resolve => {
- const url = window.baseUrl + '/api/issues/search';
- const options = {
- branch: this.options.branch,
- componentKeys: this.options.component.key,
- resolved: false,
- ps: 1,
- facets: 'types,severities,tags'
- };
+ const options = {
+ branch: this.options.branch,
+ componentKeys: this.options.component.key,
+ resolved: false,
+ ps: 1,
+ facets: 'types,severities,tags'
+ };
- $.get(url, options).done(data => {
+ return searchIssues(options).then(
+ data => {
const typesFacet = data.facets.find(facet => facet.property === 'types').values;
const typesOrder = ['BUG', 'VULNERABILITY', 'CODE_SMELL'];
const sortedTypesFacet = sortBy(typesFacet, v => typesOrder.indexOf(v.val));
this.typesFacet = sortedTypesFacet;
this.severitiesFacet = sortedSeveritiesFacet;
this.issuesCount = data.total;
-
- resolve();
- });
- });
+ },
+ () => {}
+ );
},
requestTests() {
- return new Promise(resolve => {
- const url = window.baseUrl + '/api/tests/list';
- const options = { branch: this.options.branch, testFileKey: this.options.component.key };
-
- $.get(url, options).done(data => {
+ return getTests({ branch: this.options.branch, testFileKey: this.options.component.key }).then(
+ data => {
this.tests = data.tests;
this.testSorting = 'status';
this.testAsc = true;
this.sortTests(test => `${this.testsOrder.indexOf(test.status)}_______${test.name}`);
- resolve();
- });
- });
+ },
+ () => {}
+ );
},
sortTests(condition) {
showTest(e) {
const testId = $(e.currentTarget).data('id');
- const url = window.baseUrl + '/api/tests/covered_files';
- const options = { testId };
this.testsScroll = $(e.currentTarget)
.scrollParent()
.scrollTop();
- return $.get(url, options).done(data => {
- this.coveredFiles = data.files;
- this.selectedTest = this.tests.find(test => test.id === testId);
- this.render();
- });
+ getCoveredFiles({ testId }).then(
+ data => {
+ this.coveredFiles = data.files;
+ this.selectedTest = this.tests.find(test => test.id === testId);
+ this.render();
+ },
+ () => {}
+ );
},
showAllMeasures() {
}
search = (query /*: string */) => {
- this.props.onSearch(query).then(options => {
- if (this.mounted) {
- this.setState({ loading: false, options });
+ this.props.onSearch(query).then(
+ options => {
+ if (this.mounted) {
+ this.setState({ loading: false, options });
+ }
+ },
+ () => {
+ if (this.mounted) {
+ this.setState({ loading: false });
+ }
}
- });
+ );
};
handleBlur = () => {
if (facet.has('values') || this.options.app.state.get('facetsFromServer').indexOf(id) === -1) {
facet.set({ enabled: true });
} else {
- this.requestFacet(id).done(() => {
+ this.requestFacet(id).then(() => {
facet.set({ enabled: true });
});
}
this.options.app.state.set({ selectedIndex: index });
} else if (!this.options.app.state.get('maxResultsReached')) {
const that = this;
- this.fetchNextPage().done(() => {
+ this.fetchNextPage().then(() => {
that.options.app.state.set({ selectedIndex: index });
});
} else {
if (!this.options.app.state.get('maxResultsReached')) {
const that = this;
this.unbindScrollEvents();
- this.options.app.controller.fetchNextPage().done(() => {
+ this.options.app.controller.fetchNextPage().then(() => {
that.bindScrollEvents();
});
}
import ItemsView from './views/items-view';
import ViewerView from './views/viewer-view';
import RuleView from './views/rule-view';
+import { getRuleDetails } from '../../api/rules';
let instance = null;
const Workspace = function() {
showRule(model) {
const that = this;
- this.fetchRule(model)
- .done(() => {
- model.set({ exist: true });
+ getRuleDetails({ key: model.get('key') }).then(
+ r => {
+ model.set({ ...r.rule, exist: true });
that.showViewer(RuleView, model);
- })
- .fail(() => {
+ },
+ () => {
model.set({ exist: false });
that.showViewer(RuleView, model);
- });
- },
-
- fetchRule(model) {
- const url = window.baseUrl + '/api/rules/show';
- const options = { key: model.get('key') };
- return $.get(url, options).done(r => {
- model.set(r.rule);
- });
+ }
+ );
}
};
projects / sonarqube.git / commitdiff