From e78b3b9dd0ea04e0c194af97753fa2ea8b97a3ac Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 22 Jan 2015 14:07:13 +0100 Subject: [PATCH] SONAR-5820/SONAR-5987 Ability to filter rules that are active in a quality profile --- .../coding-rules-workspace-list-item.hbs | 40 ++++++++--------- .../rule/coding-rules-profile-activation.hbs | 6 ++- .../src/main/js/coding-rules/controller.js | 1 + .../src/main/js/coding-rules/models/rules.js | 17 ++++--- .../rule/profile-activation-view.js | 8 +--- .../js/coding-rules/rule/rule-profile-view.js | 17 ++++--- .../coding-rules/rule/rule-profiles-view.js | 15 ++++--- .../coding-rules/workspace-list-item-view.js | 45 +++++++++---------- 8 files changed, 79 insertions(+), 70 deletions(-) diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-list-item.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-list-item.hbs index 92087c04044..7db42af3919 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-list-item.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-list-item.hbs @@ -1,19 +1,17 @@ - {{#if activeProfile}} - {{#if activeProfile.severity}} - - {{/if}} + {{#if activation}} + {{/if}} - {{#if activeProfile}} + {{#any activation selectedProfile}} {{#if canWrite}} {{/if}} - {{/if}} + {{/any}}
- {{severityIcon activeProfile.severity}} - {{#eq activeProfile.inherit 'OVERRIDES'}} - - {{/eq}} - {{#eq activeProfile.inherit 'INHERITED'}} - - {{/eq}} - + {{severityIcon activation.severity}} + {{#eq activation.inherit 'OVERRIDES'}} + + {{/eq}} + {{#eq activation.inherit 'INHERITED'}} + + {{/eq}} + @@ -39,24 +37,24 @@
- {{#if activeProfile.severity}} - {{#eq activeProfile.inherit 'NONE'}} + {{#if activation}} + {{#eq activation.inherit 'NONE'}} {{/eq}} {{else}} - + {{#unless isTemplate}} + + {{/unless}} {{/if}}
diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs index 36f422a6710..a13691e5705 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs @@ -1,3 +1,5 @@ +{{log this}} +
{{#if change}} @@ -20,7 +22,7 @@

{{t 'coding_rules.quality_profile'}}

- {{#if key}} + {{#any key qProfile}} {{name}} {{else}} - {{/if}} + {{/any}} diff --git a/server/sonar-web/src/main/js/coding-rules/controller.js b/server/sonar-web/src/main/js/coding-rules/controller.js index f00691c679d..4d512eaeef9 100644 --- a/server/sonar-web/src/main/js/coding-rules/controller.js +++ b/server/sonar-web/src/main/js/coding-rules/controller.js @@ -20,6 +20,7 @@ define([ if (profile != null) { fields.push('actives'); fields.push('params'); + fields.push('isTemplate'); } return { p: this.app.state.get('page'), diff --git a/server/sonar-web/src/main/js/coding-rules/models/rules.js b/server/sonar-web/src/main/js/coding-rules/models/rules.js index 60bb4d7e48f..6c282ee0e48 100644 --- a/server/sonar-web/src/main/js/coding-rules/models/rules.js +++ b/server/sonar-web/src/main/js/coding-rules/models/rules.js @@ -7,18 +7,21 @@ define([ parseRules: function (r) { var rules = r.rules, - profileBases = r.qProfiles || []; + profiles = r.qProfiles || []; if (r.actives != null) { rules = rules.map(function (rule) { - var profiles = (r.actives[rule.key] || []).map(function (profile) { - _.extend(profile, profileBases[profile.qProfile]); - if (profile.parent != null) { - _.extend(profile, { parentProfile: profileBases[profile.parent] }); + var activations = (r.actives[rule.key] || []).map(function (activation) { + var profile = profiles[activation.qProfile]; + if (profile != null) { + _.extend(activation, { profile: profile }); + if (profile.parent != null) { + _.extend(activation, { parentProfile: profiles[profile.parent] }); + } } - return profile; + return activation; }); - return _.extend(rule, { activeProfile: profiles.length > 0 ? profiles[0] : null }); + return _.extend(rule, { activation: activations.length > 0 ? activations[0] : null }); }); } return rules; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js index f83b0341a9a..1edcf56028e 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js @@ -83,14 +83,10 @@ define([ params: paramsHash } }).done(function () { - if (that.options.fromList) { - that.options.rule.set({ activeProfile: { qProfile: profileKey, inherit: 'NONE', severity: severity } }); - } else { - that.options.app.controller.showDetails(that.options.rule); - } + that.trigger('profileActivated', severity, params); window.process.finishBackgroundProcess(p); }).fail(function () { - that.options.app.controller.showDetails(that.options.rule); + that.trigger('profileActivationFailed'); window.process.failBackgroundProcess(p); }); }, diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js index 37f1cbcdf53..4ce97d6a927 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js @@ -30,12 +30,17 @@ define([ }, change: function () { - new ProfileActivationView({ - model: this.model, - collection: this.model.collection, - rule: this.options.rule, - app: this.options.app - }).render(); + var that = this, + activationView = new ProfileActivationView({ + model: this.model, + collection: this.model.collection, + rule: this.options.rule, + app: this.options.app + }); + activationView.on('profileActivated', function () { + that.options.app.controller.showDetails(that.options.rule); + }); + activationView.render(); }, revert: function () { diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js index bead27c9bed..b903b130ea4 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js @@ -41,11 +41,16 @@ define([ }, activate: function () { - new ProfileActivationView({ - rule: this.model, - collection: this.collection, - app: this.options.app - }).render(); + var that = this, + activationView = new ProfileActivationView({ + rule: this.model, + collection: this.collection, + app: this.options.app + }); + activationView.on('profileActivated', function () { + that.options.app.controller.showDetails(that.model); + }); + activationView.render(); }, serializeData: function () { diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js index 8a8dc8e2c57..19810a6e5a5 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js @@ -16,6 +16,8 @@ define([ 'click': 'selectCurrent', 'click .js-rule': 'openRule', 'click .coding-rules-detail-quality-profile-activate': 'activate', + 'click .coding-rules-detail-quality-profile-change': 'change', + 'click .coding-rules-detail-quality-profile-revert': 'revert', 'click .coding-rules-detail-quality-profile-deactivate': 'deactivate' }, @@ -27,28 +29,31 @@ define([ this.options.app.controller.showDetails(this.model); }, - getActiveProfile: function () { - return this.model.get('activeProfile'); - }, - activate: function () { - var activeProfile = this.options.app.state.get('query').qprofile, + var that = this, + selectedProfile = this.options.app.state.get('query').qprofile, othersQualityProfiles = _.reject(this.options.app.qualityProfiles, function (profile) { - return profile.key === activeProfile; + return profile.key === selectedProfile; + }), + activationView = new ProfileActivationView({ + rule: this.model, + collection: new Backbone.Collection(othersQualityProfiles), + app: this.options.app }); - - new ProfileActivationView({ - rule: this.model, - collection: new Backbone.Collection(othersQualityProfiles), - app: this.options.app, - fromList: true - }).render(); + activationView.on('profileActivated', function (severity) { + var activation = { + severity: severity, + inherit: 'NONE' + }; + that.model.set({ activation: activation }); + }); + activationView.render(); }, deactivate: function () { var that = this, ruleKey = this.model.get('key'), - myProfile = this.model.get('activeProfile'); + activation = this.model.get('activation'); window.confirmDialog({ title: t('coding_rules.deactivate'), html: tp('coding_rules.deactivate.confirm'), @@ -58,28 +63,22 @@ define([ type: 'POST', url: baseUrl + '/api/qualityprofiles/deactivate_rule', data: { - profile_key: myProfile.qProfile, + profile_key: activation.qProfile, rule_key: ruleKey } }).done(function () { window.process.finishBackgroundProcess(p); - var newProfile = _.extend({}, myProfile, { severity: undefined }); - that.model.set({ activeProfile: newProfile }); + that.model.unset('activation'); }); } }); }, serializeData: function () { - var activeProfile = this.getActiveProfile(), - selectedProfile = this.options.app.state.get('query').qprofile; - if (selectedProfile != null && activeProfile == null) { - activeProfile = selectedProfile; - } return _.extend(WorkspaceListItemView.prototype.serializeData.apply(this, arguments), { tags: _.union(this.model.get('sysTags'), this.model.get('tags')), canWrite: this.options.app.canWrite, - activeProfile: activeProfile + selectedProfile: this.options.app.state.get('query').qprofile }); } }); -- 2.39.5