From dce19594e8261e9b848fc064d62fb91f7559e795 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 22 Feb 2016 16:05:40 +0100 Subject: [PATCH] improve code quality --- .../src/main/js/apps/coding-rules/rule-details-view.js | 2 +- .../apps/coding-rules/rule/custom-rule-creation-view.js | 6 +++--- .../js/apps/coding-rules/rule/profile-activation-view.js | 6 +++--- .../main/js/apps/coding-rules/rule/rule-profiles-view.js | 2 +- .../main/js/apps/coding-rules/workspace-list-item-view.js | 2 +- .../src/main/js/apps/issues/facets/project-facet.js | 7 ++++++- .../src/main/js/apps/issues/facets/rule-facet.js | 2 +- .../sonar-web/src/main/js/apps/issues/facets/tag-facet.js | 2 +- server/sonar-web/src/main/js/apps/measures/app.js | 7 ++++++- .../src/main/js/apps/permission-templates/users-view.js | 2 +- .../src/main/js/apps/project-permissions/users-view.js | 2 +- .../apps/quality-profiles/change-profile-parent-view.js | 2 +- .../main/js/apps/quality-profiles/copy-profile-view.js | 2 +- .../main/js/apps/quality-profiles/delete-profile-view.js | 2 +- .../quality-profiles/restore-built-in-profiles-view.js | 2 +- .../sonar-web/src/main/js/components/SelectList/index.js | 2 +- .../src/main/js/components/source-viewer/main.js | 8 ++++---- .../main/js/components/source-viewer/measures-overlay.js | 4 ++-- .../js/components/source-viewer/popups/coverage-popup.js | 4 ++-- .../components/source-viewer/popups/duplication-popup.js | 2 +- .../sonar-web/src/main/js/widgets/issue-filter/widget.js | 7 ++++++- 21 files changed, 45 insertions(+), 30 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js index ddf87c1efbe..b70cd1df324 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js @@ -185,8 +185,8 @@ export default Marionette.LayoutView.extend({ return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), { isEditable, - canWrite: this.options.app.canWrite, qualityProfilesVisible, + canWrite: this.options.app.canWrite, allTags: _.union(this.model.get('sysTags'), this.model.get('tags')) }); } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js index a76577128f9..cea722f54cc 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js @@ -200,10 +200,10 @@ export default ModalFormView.extend({ }); return _.extend(ModalFormView.prototype.serializeData.apply(this, arguments), { - change: this.model && this.model.has('key'), params, - severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'], - statuses + statuses, + change: this.model && this.model.has('key'), + severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'] }); } }); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js index e9f526e398e..2b76f1f1fc6 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js @@ -101,9 +101,9 @@ export default ModalForm.extend({ type: 'POST', url: '/api/qualityprofiles/activate_rule', data: { + severity, profile_key: profileKey, rule_key: ruleKey, - severity, params: paramsHash }, statusCode: { @@ -148,10 +148,10 @@ export default ModalForm.extend({ const contextProfile = this.options.app.state.get('query').qprofile; return _.extend(ModalForm.prototype.serializeData.apply(this, arguments), { - change: this.model && this.model.has('severity'), params, - qualityProfiles: availableProfiles, contextProfile, + change: this.model && this.model.has('severity'), + qualityProfiles: availableProfiles, severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'], saveEnabled: !_.isEmpty(availableProfiles) || (this.model && this.model.get('qProfile')), isCustomRule: (this.model && this.model.has('templateKey')) || this.options.rule.has('templateKey') diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js index 2dda9a223a5..88c5dc208ea 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profiles-view.js @@ -71,8 +71,8 @@ export default Marionette.CompositeView.extend({ if (that.options.app.state.get('query').qprofile === profile) { const activation = { severity, - inherit: 'NONE', params, + inherit: 'NONE', qProfile: profile }; that.model.set({ activation }); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js index 86e26521d02..13a433a87e9 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js +++ b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js @@ -68,8 +68,8 @@ export default WorkspaceListItemView.extend(RuleFilterMixin).extend({ activationView.on('profileActivated', function (severity, params, profile) { const activation = { severity, - inherit: 'NONE', params, + inherit: 'NONE', qProfile: profile }; that.model.set({ activation }); diff --git a/server/sonar-web/src/main/js/apps/issues/facets/project-facet.js b/server/sonar-web/src/main/js/apps/issues/facets/project-facet.js index ffbc7772b2d..50cc3e3531a 100644 --- a/server/sonar-web/src/main/js/apps/issues/facets/project-facet.js +++ b/server/sonar-web/src/main/js/apps/issues/facets/project-facet.js @@ -61,7 +61,12 @@ export default CustomValuesFacet.extend({ quietMillis: 300, url: this.getUrl(), data (term, page) { - return { q: term, componentId, p: page, ps: 25 }; + return { + componentId, + q: term, + p: page, + ps: 25 + }; }, results (data) { return { diff --git a/server/sonar-web/src/main/js/apps/issues/facets/rule-facet.js b/server/sonar-web/src/main/js/apps/issues/facets/rule-facet.js index 99be8cb6dbd..b0dd063d6ae 100644 --- a/server/sonar-web/src/main/js/apps/issues/facets/rule-facet.js +++ b/server/sonar-web/src/main/js/apps/issues/facets/rule-facet.js @@ -43,8 +43,8 @@ export default CustomValuesFacet.extend({ }, width: '100%', ajax: { - quietMillis: 300, url, + quietMillis: 300, data (term, page) { return { q: term, p: page }; }, diff --git a/server/sonar-web/src/main/js/apps/issues/facets/tag-facet.js b/server/sonar-web/src/main/js/apps/issues/facets/tag-facet.js index c383ac36624..e537955cebc 100644 --- a/server/sonar-web/src/main/js/apps/issues/facets/tag-facet.js +++ b/server/sonar-web/src/main/js/apps/issues/facets/tag-facet.js @@ -40,8 +40,8 @@ export default CustomValuesFacet.extend({ }, width: '100%', ajax: { - quietMillis: 300, url, + quietMillis: 300, data (term) { return { q: term, ps: 10 }; }, diff --git a/server/sonar-web/src/main/js/apps/measures/app.js b/server/sonar-web/src/main/js/apps/measures/app.js index 6492108fa92..a0979df4f13 100644 --- a/server/sonar-web/src/main/js/apps/measures/app.js +++ b/server/sonar-web/src/main/js/apps/measures/app.js @@ -31,6 +31,7 @@ import MetricFilterView from '../../components/navigator/filters/metric-filters' import { translate } from '../../helpers/l10n'; const NavigatorApp = new Marionette.Application(); + const newLastAnalysisFilter = function () { return new BaseFilters.Filter({ name: translate('measure_filter.criteria.last_analysis'), @@ -42,10 +43,11 @@ const newLastAnalysisFilter = function () { optional: true }); }; + const newMetricFilter = function (property) { return new BaseFilters.Filter({ - name: translate('measure_filter.criteria.metric'), property, + name: translate('measure_filter.criteria.metric'), type: MetricFilterView, metrics: window.SS.metrics, periods: window.SS.metricPeriods, @@ -54,6 +56,7 @@ const newMetricFilter = function (property) { optional: true }); }; + const newNameFilter = function () { return new BaseFilters.Filter({ name: translate('measure_filter.name_contains'), @@ -63,6 +66,7 @@ const newNameFilter = function () { optional: true }); }; + const newAlertFilter = function () { return new BaseFilters.Filter({ name: translate('measure_filter.criteria.alert'), @@ -77,6 +81,7 @@ const newAlertFilter = function () { } }); }; + const init = function () { NavigatorApp.addRegions({ filtersRegion: '.navigator-filters' }); diff --git a/server/sonar-web/src/main/js/apps/permission-templates/users-view.js b/server/sonar-web/src/main/js/apps/permission-templates/users-view.js index 9e2d42ececd..318dabbb294 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/users-view.js +++ b/server/sonar-web/src/main/js/apps/permission-templates/users-view.js @@ -30,6 +30,7 @@ export default Modal.extend({ const searchUrl = '/api/permissions/template_users?ps=100&permission=' + this.options.permission.key + '&templateId=' + this.options.permissionTemplate.id; new window.SelectList({ + searchUrl, el: this.$('#permission-templates-users'), width: '100%', readOnly: false, @@ -38,7 +39,6 @@ export default Modal.extend({ return item.name + '
' + item.login + ''; }, queryParam: 'q', - searchUrl, selectUrl: '/api/permissions/add_user_to_template', deselectUrl: '/api/permissions/remove_user_from_template', extra: { diff --git a/server/sonar-web/src/main/js/apps/project-permissions/users-view.js b/server/sonar-web/src/main/js/apps/project-permissions/users-view.js index 691da91d8d4..07fc18ad858 100644 --- a/server/sonar-web/src/main/js/apps/project-permissions/users-view.js +++ b/server/sonar-web/src/main/js/apps/project-permissions/users-view.js @@ -30,6 +30,7 @@ export default Modal.extend({ const searchUrl = '/api/permissions/users?ps=100&permission=' + this.options.permission + '&projectId=' + this.options.project; new window.SelectList({ + searchUrl, el: this.$('#project-permissions-users'), width: '100%', readOnly: false, @@ -38,7 +39,6 @@ export default Modal.extend({ return item.name + '
' + item.login + ''; }, queryParam: 'q', - searchUrl, selectUrl: '/api/permissions/add_user', deselectUrl: '/api/permissions/remove_user', extra: { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/change-profile-parent-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/change-profile-parent-view.js index 183877eba76..7dab90e61ae 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/change-profile-parent-view.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/change-profile-parent-view.js @@ -49,8 +49,8 @@ export default ModalFormView.extend({ parentKey: parent }; return $.ajax({ - type: 'POST', url, + type: 'POST', data: options, statusCode: { // do not show global error diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/copy-profile-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/copy-profile-view.js index ad5950a7764..1ecb6c92aea 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/copy-profile-view.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/copy-profile-view.js @@ -40,8 +40,8 @@ export default ModalFormView.extend({ toName: name }; return $.ajax({ - type: 'POST', url, + type: 'POST', data: options, statusCode: { // do not show global error diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/delete-profile-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/delete-profile-view.js index 79d24d47ced..bc255295038 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/delete-profile-view.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/delete-profile-view.js @@ -39,8 +39,8 @@ export default ModalFormView.extend({ const url = '/api/qualityprofiles/delete'; const options = { profileKey: this.model.get('key') }; return $.ajax({ - type: 'POST', url, + type: 'POST', data: options, statusCode: { // do not show global error diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/restore-built-in-profiles-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/restore-built-in-profiles-view.js index 2115422bf38..97cd9797c6d 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/restore-built-in-profiles-view.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/restore-built-in-profiles-view.js @@ -52,8 +52,8 @@ export default ModalFormView.extend({ const options = { language: lang }; this.selectedLanguage = _.findWhere(this.options.languages, { key: lang }).name; return $.ajax({ - type: 'POST', url, + type: 'POST', data: options, statusCode: { // do not show global error diff --git a/server/sonar-web/src/main/js/components/SelectList/index.js b/server/sonar-web/src/main/js/components/SelectList/index.js index 6c668832d43..b60aeb879c0 100644 --- a/server/sonar-web/src/main/js/components/SelectList/index.js +++ b/server/sonar-web/src/main/js/components/SelectList/index.js @@ -337,9 +337,9 @@ const SelectListView = Backbone.View.extend({ data[this.settings.queryParam] = query; data.selected = 'all'; this.collection.fetch({ + data, url: this.settings.searchUrl, reset: true, - data, success () { that.hideFetchSpinner(); }, diff --git a/server/sonar-web/src/main/js/components/source-viewer/main.js b/server/sonar-web/src/main/js/components/source-viewer/main.js index 84533248323..c013b8e3c53 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/main.js +++ b/server/sonar-web/src/main/js/components/source-viewer/main.js @@ -152,9 +152,9 @@ export default Marionette.LayoutView.extend({ const url = '/api/components/app'; const data = { uuid: this.model.id }; return $.ajax({ - type: 'GET', url, data, + type: 'GET', statusCode: { 404 () { that.model.set({ exist: false }); @@ -425,8 +425,8 @@ export default Marionette.LayoutView.extend({ }; return $.get(url, options).done(function (data) { const popup = new CoveragePopupView({ - collection: new Backbone.Collection(data.tests), row, + collection: new Backbone.Collection(data.tests), tests: $(e.currentTarget).data('tests'), triggerEl: $(e.currentTarget) }); @@ -474,9 +474,9 @@ export default Marionette.LayoutView.extend({ return isOk; }); const popup = new DuplicationPopupView({ + inRemovedComponent, triggerEl: $(e.currentTarget), model: this.model, - inRemovedComponent, collection: new Backbone.Collection(blocks) }); popup.render(); @@ -503,9 +503,9 @@ export default Marionette.LayoutView.extend({ const that = this; const line = $(e.currentTarget).data('line-number'); const popup = new LineActionsPopupView({ + line, triggerEl: $(e.currentTarget), model: this.model, - line, row: $(e.currentTarget).closest('.source-line') }); popup.on('onManualIssueAdded', function (issue) { diff --git a/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js b/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js index 5cb86419f15..bfcbe8d3126 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js +++ b/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js @@ -205,9 +205,9 @@ export default ModalView.extend({ }); that.model.set({ issuesFacets, - issuesCount: data.total, maxCountBySeverity, - maxCountByTag + maxCountByTag, + issuesCount: data.total }); }); }, diff --git a/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js index 81d3a175c9a..94e8c5d3689 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js +++ b/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js @@ -61,8 +61,8 @@ export default Popup.extend({ }); return { testFiles, - tests: this.options.tests, - row + row, + tests: this.options.tests }; } }); diff --git a/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js b/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js index 43a3a29b475..6aa3f7e2c7e 100644 --- a/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js +++ b/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js @@ -54,8 +54,8 @@ export default Popup.extend({ return '' + a + b + c; }); return { - component: this.model.toJSON(), duplications, + component: this.model.toJSON(), inRemovedComponent: this.options.inRemovedComponent }; } diff --git a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js index ef4375060fb..3382342b988 100644 --- a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js +++ b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js @@ -32,17 +32,21 @@ import StatusesTemplate from './templates/widget-issue-filter-statuses.hbs'; const FACET_LIMIT = 15; + const defaultComparator = function (item) { return -item.count; }; + const defaultFilter = function (item) { const items = this.query[this.property]; return items == null || (items != null && items.split(',').indexOf(item.val) !== -1); }; + const defaultLabel = function (item) { return item.val; }; + const defaultLink = function (item, property, query, index, items, mode) { const criterion = {}; criterion[property] = item.val; @@ -57,6 +61,7 @@ const defaultLink = function (item, property, query, index, items, mode) { return '/issues/search#' + getQuery(r); } }; + const byDistributionConf = { 'severities': { template: SeveritiesTemplate, @@ -300,9 +305,9 @@ export default Marionette.ItemView.extend({ const facetMode = this.options.displayMode; const url = '/api/issues/search'; const options = _.extend({}, this.query, { + facetMode, ps: 1, facets: this.options.distributionAxis, - facetMode, additionalFields: '_all' }); if (this.options.componentUuid != null) { -- 2.39.5