From df728b2edfc519075112cc157e4d7fe23fe514cb Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 13 Apr 2015 09:56:02 +0200 Subject: [PATCH] SONAR-5851 replace old profiles page with new one --- .../src/main/hbs/nav/nav-global-navbar.hbs | 4 +- .../src/main/js/quality-profiles/app.js | 2 +- .../controllers/old_profiles_controller.rb | 574 ++++++++++++++++++ .../app/controllers/profiles_controller.rb | 547 +---------------- .../quality_profiles_controller.rb | 33 - .../_copy_form.html.erb | 2 +- .../_create_form.html.erb | 2 +- .../_diff_rule.html.erb | 0 .../{profiles => old_profiles}/_new.html.erb | 2 +- .../_rename_form.html.erb | 2 +- .../_restore_built_in_form.html.erb | 2 +- .../_restore_form.html.erb | 2 +- .../app/views/old_profiles/_tabs.html.erb | 26 + .../changelog.html.erb | 6 +- .../compare.html.erb | 10 +- .../{profiles => old_profiles}/edit.html.erb | 0 .../app/views/old_profiles/index.html.erb | 133 ++++ .../inheritance.html.erb | 4 +- .../{profiles => old_profiles}/new.html.erb | 0 .../permalinks.html.erb | 8 +- .../projects.html.erb | 10 +- .../{profiles => old_profiles}/show.html.erb | 4 +- .../WEB-INF/app/views/profiles/_tabs.html.erb | 26 - .../WEB-INF/app/views/profiles/index.html.erb | 136 +---- .../app/views/quality_profiles/index.html.erb | 5 - .../sonar-web/src/test/js/quality-profiles.js | 22 +- .../{quality_profiles.jade => profiles.jade} | 0 27 files changed, 781 insertions(+), 781 deletions(-) create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/controllers/old_profiles_controller.rb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/controllers/quality_profiles_controller.rb rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_copy_form.html.erb (95%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_create_form.html.erb (93%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_diff_rule.html.erb (100%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_new.html.erb (92%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_rename_form.html.erb (91%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_restore_built_in_form.html.erb (88%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/_restore_form.html.erb (85%) create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_tabs.html.erb rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/changelog.html.erb (91%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/compare.html.erb (88%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/edit.html.erb (100%) create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/index.html.erb rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/inheritance.html.erb (89%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/new.html.erb (100%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/permalinks.html.erb (63%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/projects.html.erb (88%) rename server/sonar-web/src/main/webapp/WEB-INF/app/views/{profiles => old_profiles}/show.html.erb (93%) delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_profiles/index.html.erb rename server/sonar-web/src/test/views/{quality_profiles.jade => profiles.jade} (100%) diff --git a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs index d3821e0922d..5ca0d9d843f 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs @@ -41,8 +41,8 @@
  • {{t 'quality_profiles.page'}}
    • -
  • - NEW {{t 'quality_profiles.page'}} +
  • + OLD {{t 'quality_profiles.page'}}
  • {{t 'quality_gates.page'}} diff --git a/server/sonar-web/src/main/js/quality-profiles/app.js b/server/sonar-web/src/main/js/quality-profiles/app.js index 8cf66d6bf15..b3e2a269ea6 100644 --- a/server/sonar-web/src/main/js/quality-profiles/app.js +++ b/server/sonar-web/src/main/js/quality-profiles/app.js @@ -67,7 +67,7 @@ require([ }); function getRoot () { - var QUALITY_PROFILES = '/quality_profiles', + var QUALITY_PROFILES = '/profiles', path = window.location.pathname, pos = path.indexOf(QUALITY_PROFILES); return path.substr(0, pos + QUALITY_PROFILES.length); diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/old_profiles_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/old_profiles_controller.rb new file mode 100644 index 00000000000..39c71eaf1f2 --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/old_profiles_controller.rb @@ -0,0 +1,574 @@ +# +# SonarQube, open source software quality management tool. +# Copyright (C) 2008-2014 SonarSource +# mailto:contact AT sonarsource DOT com +# +# SonarQube 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. +# +# SonarQube 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. +# +class OldProfilesController < ApplicationController + + helper :profiles + + SECTION=Navigation::SECTION_QUALITY_PROFILES + + def self.root_breadcrumb + {:name => Api::Utils.message('quality_profiles.page'), :url => {:controller => 'old_profiles', :action => 'index'}} + end + + # GET /profiles/index + def index + add_breadcrumbs OldProfilesController::root_breadcrumb + call_backend do + @profiles = Internal.quality_profiles.allProfiles().to_a + @active_rule_counts = Internal.qprofile_loader.countAllActiveRules() + end + Api::Utils.insensitive_sort!(@profiles) { |profile| profile.name() } + end + + # GET /profiles/show?key= + def show + require_parameters 'key' + call_backend do + @profile = Internal.qprofile_loader.getByKey(params[:key]) + if @profile + @deprecated_active_rules = Internal.qprofile_loader.countDeprecatedActiveRulesByProfile(@profile.getKey()) + @stats = Internal.qprofile_loader.getStatsByProfile(@profile.getKey()) + set_profile_breadcrumbs + else + # SONAR-5630 + flash[:error] = message('quality_profiles.deleted_profile', :params => params[:key]) + redirect_to :controller => 'old_profiles', :action => 'index' + end + end + end + + # GET /profiles/create_form?language= + def create_form + require_parameters 'language' + render :partial => 'old_profiles/create_form', :locals => {:language_key => params[:language]} + end + + # POST /profiles/create?name=&language=&[backup=] + def create + verify_post_request + call_backend do + files_by_key = {} + if params[:backup] + params[:backup].each_pair do |importer_key, file| + unless file.blank? + files_by_key[importer_key] = Api::Utils.read_post_request_param(file) + end + end + end + profile_name = Java::OrgSonarServerQualityprofile::QProfileName.new(params[:language], params[:name]) + result = Internal.qprofile_service.create(profile_name, files_by_key) + flash[:notice] = message('quality_profiles.profile_x_created', :params => result.profile().getName()) + flash_result(result) + end + redirect_to :action => 'index' + end + + # Modal window to restore built-in profiles + # GET /profiles/restore_built_in_form/ + def restore_built_in_form + verify_ajax_request + require_parameters 'language' + @language = java_facade.getLanguages().find { |l| l.getKey()==params[:language].to_s } + call_backend do + @builtin_profile_names = Internal.qprofile_service.builtInProfileNamesForLanguage(params[:language].to_s) + end + render :partial => 'old_profiles/restore_built_in_form' + end + + # POST /profiles/restore_built_in?language= + def restore_built_in + verify_post_request + require_parameters 'language' + call_backend do + Internal.qprofile_service.restoreBuiltInProfilesForLanguage(params[:language].to_s) + end + redirect_to :action => 'index' + end + + # POST /profiles/delete/ + def delete + verify_post_request + require_parameters 'id' + + profile_key = profile_id_to_key(params[:id].to_i) + call_backend do + Internal.qprofile_service.delete(profile_key) + end + + redirect_to(:controller => 'old_profiles', :action => 'index') + end + + + # POST /profiles/set_as_default/ + def set_as_default + verify_post_request + require_parameters 'id' + + profile_key = profile_id_to_key(params[:id].to_i) + call_backend do + Internal.qprofile_service.setDefault(profile_key) + end + redirect_to :action => 'index' + end + + + # GET /profiles/copy_form/ + def copy_form + require_parameters 'id' + + profile_id = params[:id].to_i + call_backend do + @profile = Internal.quality_profiles.profile(profile_id) + end + not_found('Profile not found') unless @profile + + render :partial => 'old_profiles/copy_form' + end + + # POST /profiles/copy/?name=[&overwrite=] + def copy + verify_post_request + verify_ajax_request + require_parameters 'id' + + source_id = params[:id].to_i + source_profile = Internal.quality_profiles.profile(source_id) + + source_key=profile_id_to_key(source_id) + target_name = params['name'] + + overwrite = (params['overwrite'] == target_name) + target_profile = nil + + unless overwrite + target_profile = Internal.quality_profiles.profile(target_name, source_profile.language()) + end + + if target_profile.nil? || overwrite + call_backend do + Internal.qprofile_service.copyToName(source_key, target_name) + if overwrite + flash[:notice] = message('quality_profiles.copy_x_overwritten', :params => target_name) + else + flash[:notice] = message('quality_profiles.profile_x_not_activated', :params => target_name) + end + render :text => 'ok', :status => 200 + end + else + render :text => message('quality_profiles.copy_overwrite_x', :params => target_name), :status => 409 + end + end + + # the backup action is allow to non-admin users : see http://jira.codehaus.org/browse/SONAR-2039 + def backup + verify_post_request + require_parameters 'key' + + profile_key=params[:key] + call_backend do + xml = Internal.qprofile_service.backup(profile_key) + send_data(xml, :type => 'text/xml', :disposition => "attachment; filename=#{profile_key}.xml") + end + end + + + # Modal window to restore profile backup + # GET /profiles/restore_form/ + def restore_form + verify_ajax_request + render :partial => 'old_profiles/restore_form' + end + + # POST /profiles/restore?backup= + def restore + if params[:backup].blank? + flash[:warning] = message('quality_profiles.please_upload_backup_file') + else + call_backend do + xml=Api::Utils.read_post_request_param(params[:backup]) + Internal.qprofile_service.restore(xml) + end + end + redirect_to :action => 'index' + end + + + # GET /profiles/export?name=&language=&format + def export + language = params[:language] + if params[:name].blank? + profile = Internal.qprofile_service.getDefault(language) + else + profile = Internal.qprofile_loader.getByLangAndName(language, CGI::unescape(params[:name])) + end + not_found('Profile not found') unless profile + + if params[:format].blank? + # standard sonar format + result = Internal.qprofile_service.backup(profile.getKee()) + send_data(result, :type => 'text/xml', :disposition => 'inline') + else + exporter_key = params[:format] + result = Internal.qprofile_exporters.export(profile.getKee(), exporter_key) + send_data(result, :type => Internal.qprofile_exporters.mimeType(exporter_key), :disposition => 'inline') + end + end + + # GET /profiles/inheritance?id= + def inheritance + require_parameters 'id' + + call_backend do + @profile = Internal.quality_profiles.profile(params[:id].to_i) + not_found('Profile not found') unless @profile + @parent = Internal.quality_profiles.parent(@profile) if @profile.parent + @ancestors = Internal.quality_profiles.ancestors(@profile).to_a + @children = Internal.quality_profiles.children(@profile).to_a + profiles = Internal.quality_profiles.profilesByLanguage(@profile.language()).to_a.reject { |p| p.id == @profile.id() || p.parent() == @profile.name() } + profiles = Api::Utils.insensitive_sort(profiles) { |p| p.name() } + @select_parent = [[message('none'), nil]] + profiles.collect { |profile| [profile.name(), profile.id()] } + + @all_profile_stats = Internal.qprofile_loader.getAllProfileStats() + end + + set_profile_breadcrumbs + end + + # POST /profiles/change_parent?id=&parent_id= + def change_parent + verify_post_request + access_denied unless has_role?(:profileadmin) + require_parameters 'id' + + profile_key = profile_id_to_key(params[:id].to_i) + parent_key = profile_id_to_key(params[:parent_id].to_i) unless params[:parent_id].empty? + call_backend do + Internal.qprofile_service.setParent(profile_key, parent_key) + end + redirect_to :action => 'inheritance', :id => params[:id] + end + + # GET /profiles/changelog?key= + def changelog + require_parameters 'key' + + @profile = Internal.qprofile_loader.getByKey(params[:key]) + not_found('Quality profile does not exist') unless @profile + search = {'profileKey' => @profile.key().to_s, 'since' => params[:since], 'to' => params[:to], 'p' => params[:p]} + result = Internal.component(Java::OrgSonarServerActivity::RubyQProfileActivityService.java_class).search(search) + @changes = result.activities + @paging = result.paging + + set_profile_breadcrumbs + end + + # + # + # GET /profiles/permalinks?id= + # + # + def permalinks + require_parameters 'id' + @profile = Internal.quality_profiles.profile(params[:id].to_i) + not_found('Profile not found') unless @profile + set_profile_breadcrumbs + end + + + # + # + # GET /profiles/projects/ + # + # + def projects + require_parameters 'id' + + call_backend do + @profile = Internal.quality_profiles.profile(params[:id].to_i) + not_found('Profile not found') unless @profile + projects = Internal.quality_profiles.projects(params[:id].to_i) + @projects = Api::Utils.insensitive_sort(projects.to_a) { |p| p.name } + set_profile_breadcrumbs + end + end + + + # POST /profiles/add_project?id=&project= + def add_project + verify_post_request + require_parameters 'id', 'project' + + project_id = Api::Utils.project_id(params[:project]) + profile_id = params[:id].to_i + + call_backend do + Internal.quality_profiles.addProject(profile_id, project_id.to_i) + end + redirect_to :action => 'projects', :id => profile_id + end + + # POST /profiles/remove_project?id=&project= + def remove_project + verify_post_request + require_parameters 'id', 'project' + + profile_id = params[:id].to_i + call_backend do + Internal.quality_profiles.removeProject(profile_id, params[:project].to_i) + end + redirect_to :action => 'projects', :id => profile_id + end + + # POST /profiles/remove_projects?id= + def remove_projects + verify_post_request + require_parameters 'id' + + profile_id = params[:id].to_i + call_backend do + Internal.quality_profiles.removeAllProjects(profile_id) + end + redirect_to :action => 'projects', :id => profile_id + end + + # GET /profiles/rename_form?id= + def rename_form + require_parameters 'id' + call_backend do + @profile = Internal.quality_profiles.profile(params[:id].to_i) + not_found('Profile not found') unless @profile + end + render :partial => 'old_profiles/rename_form' + end + + # POST /profiles/rename?id=&name= + def rename + verify_post_request + verify_ajax_request + require_parameters 'id' + + call_backend do + profile_key = profile_id_to_key(params[:id].to_i) + Internal.qprofile_service.rename(profile_key, params[:new_name]) + end + render :text => 'ok', :status => 200 + end + + # GET /profiles/compare?id1=&id2= + def compare + @profiles = Profile.all(:order => 'language asc, name') + id1 = params[:id1] + id2 = params[:id2] + if id1.present? && id2.present? && id1.respond_to?(:to_i) && id2.respond_to?(:to_i) + @id1 = params[:id1].to_i + @id2 = params[:id2].to_i + @profile1 = Profile.find(id1) + @profile2 = Profile.find(id2) + + arules1 = ActiveRule.all(:include => [{:active_rule_parameters => :rules_parameter}, :rule], + :conditions => ['active_rules.profile_id=?', @profile1.id]) + arules2 = ActiveRule.all(:order => 'rules.plugin_name, rules.plugin_rule_key', :include => [{:active_rule_parameters => :rules_parameter}, :rule], + :conditions => ['active_rules.profile_id=?', @profile2.id]) + + arules1.reject! { |arule| arule.rule.removed? } + arules2.reject! { |arule| arule.rule.removed? } + + diffs_by_rule={} + arules1.each do |arule1| + diffs_by_rule[arule1.rule]||=RuleDiff.new(arule1.rule) + diffs_by_rule[arule1.rule].arule1=arule1 + end + arules2.each do |arule2| + diffs_by_rule[arule2.rule]||=RuleDiff.new(arule2.rule) + diffs_by_rule[arule2.rule].arule2=arule2 + end + @in1=[] + @in2=[] + @modified=[] + @sames=[] + diffs_by_rule.values.sort.each do |diff| + case diff.status + when DIFF_IN1 then + @in1<(other) + rule.name()<=>other.rule.name + end + end + + # + # Remove active rules that are identical in both collections (same severity and same parameters) + # and return a map with results {:added => X, :removed => Y, :modified => Z, + # :rules => {rule1 => [activeruleleft1, activeruleright1], rule2 => [activeruleleft2, nil], ...]} + # Assume both collections are ordered by rule key + # + def compute_diff(arules1, arules2) + rules = {} + removed = 0 + added = 0 + modified = 0 + same = 0 + begin + diff = false + #take first item of each collection + active_rule1 = arules1.first + active_rule2 = arules2.first + if active_rule1 != nil and active_rule2 != nil + order = active_rule1.rule.key <=> active_rule2.rule.key + if order < 0 + active_rule2 = nil + rule = active_rule1.rule + diff = true + removed = removed +1 + elsif order > 0 + active_rule1 = nil + rule = active_rule2.rule + diff = true + added = added +1 + else + rule = active_rule1.rule # = active_rule2.rule + #compare severity + diff = true if active_rule1.priority != active_rule2.priority + #compare parameters + rule.parameters.each do |param| + diff = true if active_rule1.value(param.id) != active_rule2.value(param.id) + end + if diff + modified = modified + 1 + else + same = same +1 + end + end + elsif active_rule1 != nil + #no more rule in right collection + diff = true + removed = removed +1 + rule = active_rule1.rule + elsif active_rule2 != nil + #no more rule in left collection + diff = true + added = added +1 + rule = active_rule2.rule + end + # remove processed rule(s) + arules1 = arules1.drop(1) if active_rule1 != nil + arules2 = arules2.drop(1) if active_rule2 != nil + if diff + rules[rule] = [active_rule1, active_rule2] + end + end while !arules1.empty? || !arules2.empty? + return {:same => same, :added => added, :removed => removed, :modified => modified, :rules => rules} + end + + def flash_messages(messages) + # only 4 messages are kept each time to avoid cookie overflow. + if messages.hasErrors() + flash[:error]=messages.getErrors().to_a[0...4].join('
    ') + end + if messages.hasWarnings() + flash[:warning]=messages.getWarnings().to_a[0...4].join('
    ') + end + if messages.hasInfos() + flash[:notice]=messages.getInfos().to_a[0...4].join('
    ') + end + end + + def flash_result(result) + # only 4 messages are kept each time to avoid cookie overflow. + unless result.infos.empty? + flash[:notice] += '
    ' + result.infos.to_a[0...4].join('
    ') + end + unless result.warnings.empty? + flash[:warning] = result.warnings.to_a[0...4].join('
    ') + end + + end + + def set_profile_breadcrumbs + add_breadcrumbs OldProfilesController::root_breadcrumb, {:name => "#{@profile.name} (#{Api::Utils.language_name(@profile.language)})"} + end + + def profile_id_to_key(profile_id) + profile = Profile.find(profile_id) + not_found('Profile not found') unless profile + profile.kee + end +end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb index 79b88b22bb0..28a940f72ec 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb @@ -17,556 +17,15 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -class ProfilesController < ApplicationController - - SECTION=Navigation::SECTION_QUALITY_PROFILES - def self.root_breadcrumb - {:name => Api::Utils.message('quality_profiles.page'), :url => {:controller => 'profiles', :action => 'index'}} - end +class ProfilesController < ApplicationController - # GET /profiles/index def index - add_breadcrumbs ProfilesController::root_breadcrumb - call_backend do - @profiles = Internal.quality_profiles.allProfiles().to_a - @active_rule_counts = Internal.qprofile_loader.countAllActiveRules() - end - Api::Utils.insensitive_sort!(@profiles) { |profile| profile.name() } - end - - # GET /profiles/show?key= - def show - require_parameters 'key' - call_backend do - @profile = Internal.qprofile_loader.getByKey(params[:key]) - if @profile - @deprecated_active_rules = Internal.qprofile_loader.countDeprecatedActiveRulesByProfile(@profile.getKey()) - @stats = Internal.qprofile_loader.getStatsByProfile(@profile.getKey()) - set_profile_breadcrumbs - else - # SONAR-5630 - flash[:error] = message('quality_profiles.deleted_profile', :params => params[:key]) - redirect_to :controller => 'profiles', :action => 'index' - end - end - end - - # GET /profiles/create_form?language= - def create_form - require_parameters 'language' - render :partial => 'profiles/create_form', :locals => {:language_key => params[:language]} - end - - # POST /profiles/create?name=&language=&[backup=] - def create - verify_post_request - call_backend do - files_by_key = {} - if params[:backup] - params[:backup].each_pair do |importer_key, file| - unless file.blank? - files_by_key[importer_key] = Api::Utils.read_post_request_param(file) - end - end - end - profile_name = Java::OrgSonarServerQualityprofile::QProfileName.new(params[:language], params[:name]) - result = Internal.qprofile_service.create(profile_name, files_by_key) - flash[:notice] = message('quality_profiles.profile_x_created', :params => result.profile().getName()) - flash_result(result) - end - redirect_to :action => 'index' - end - - # Modal window to restore built-in profiles - # GET /profiles/restore_built_in_form/ - def restore_built_in_form - verify_ajax_request - require_parameters 'language' - @language = java_facade.getLanguages().find { |l| l.getKey()==params[:language].to_s } - call_backend do - @builtin_profile_names = Internal.qprofile_service.builtInProfileNamesForLanguage(params[:language].to_s) - end - render :partial => 'profiles/restore_built_in_form' - end - - # POST /profiles/restore_built_in?language= - def restore_built_in - verify_post_request - require_parameters 'language' - call_backend do - Internal.qprofile_service.restoreBuiltInProfilesForLanguage(params[:language].to_s) - end - redirect_to :action => 'index' - end - - # POST /profiles/delete/ - def delete - verify_post_request - require_parameters 'id' - - profile_key = profile_id_to_key(params[:id].to_i) - call_backend do - Internal.qprofile_service.delete(profile_key) - end - - redirect_to(:controller => 'profiles', :action => 'index') - end - - - # POST /profiles/set_as_default/ - def set_as_default - verify_post_request - require_parameters 'id' - - profile_key = profile_id_to_key(params[:id].to_i) - call_backend do - Internal.qprofile_service.setDefault(profile_key) - end - redirect_to :action => 'index' - end - - - # GET /profiles/copy_form/ - def copy_form - require_parameters 'id' - - profile_id = params[:id].to_i - call_backend do - @profile = Internal.quality_profiles.profile(profile_id) - end - not_found('Profile not found') unless @profile - - render :partial => 'profiles/copy_form' - end - - # POST /profiles/copy/?name=[&overwrite=] - def copy - verify_post_request - verify_ajax_request - require_parameters 'id' - - source_id = params[:id].to_i - source_profile = Internal.quality_profiles.profile(source_id) - - source_key=profile_id_to_key(source_id) - target_name = params['name'] - - overwrite = (params['overwrite'] == target_name) - target_profile = nil - - unless overwrite - target_profile = Internal.quality_profiles.profile(target_name, source_profile.language()) - end - - if target_profile.nil? || overwrite - call_backend do - Internal.qprofile_service.copyToName(source_key, target_name) - if overwrite - flash[:notice] = message('quality_profiles.copy_x_overwritten', :params => target_name) - else - flash[:notice] = message('quality_profiles.profile_x_not_activated', :params => target_name) - end - render :text => 'ok', :status => 200 - end - else - render :text => message('quality_profiles.copy_overwrite_x', :params => target_name), :status => 409 - end - end - - # the backup action is allow to non-admin users : see http://jira.codehaus.org/browse/SONAR-2039 - def backup - verify_post_request - require_parameters 'key' - - profile_key=params[:key] - call_backend do - xml = Internal.qprofile_service.backup(profile_key) - send_data(xml, :type => 'text/xml', :disposition => "attachment; filename=#{profile_key}.xml") - end - end - - - # Modal window to restore profile backup - # GET /profiles/restore_form/ - def restore_form - verify_ajax_request - render :partial => 'profiles/restore_form' - end - - # POST /profiles/restore?backup= - def restore - if params[:backup].blank? - flash[:warning] = message('quality_profiles.please_upload_backup_file') - else - call_backend do - xml=Api::Utils.read_post_request_param(params[:backup]) - Internal.qprofile_service.restore(xml) - end - end - redirect_to :action => 'index' - end - - - # GET /profiles/export?name=&language=&format - def export - language = params[:language] - if params[:name].blank? - profile = Internal.qprofile_service.getDefault(language) - else - profile = Internal.qprofile_loader.getByLangAndName(language, CGI::unescape(params[:name])) - end - not_found('Profile not found') unless profile - - if params[:format].blank? - # standard sonar format - result = Internal.qprofile_service.backup(profile.getKee()) - send_data(result, :type => 'text/xml', :disposition => 'inline') - else - exporter_key = params[:format] - result = Internal.qprofile_exporters.export(profile.getKee(), exporter_key) - send_data(result, :type => Internal.qprofile_exporters.mimeType(exporter_key), :disposition => 'inline') - end - end - - # GET /profiles/inheritance?id= - def inheritance - require_parameters 'id' - - call_backend do - @profile = Internal.quality_profiles.profile(params[:id].to_i) - not_found('Profile not found') unless @profile - @parent = Internal.quality_profiles.parent(@profile) if @profile.parent - @ancestors = Internal.quality_profiles.ancestors(@profile).to_a - @children = Internal.quality_profiles.children(@profile).to_a - profiles = Internal.quality_profiles.profilesByLanguage(@profile.language()).to_a.reject { |p| p.id == @profile.id() || p.parent() == @profile.name() } - profiles = Api::Utils.insensitive_sort(profiles) { |p| p.name() } - @select_parent = [[message('none'), nil]] + profiles.collect { |profile| [profile.name(), profile.id()] } - - @all_profile_stats = Internal.qprofile_loader.getAllProfileStats() - end - set_profile_breadcrumbs end - # POST /profiles/change_parent?id=&parent_id= - def change_parent - verify_post_request - access_denied unless has_role?(:profileadmin) - require_parameters 'id' - - profile_key = profile_id_to_key(params[:id].to_i) - parent_key = profile_id_to_key(params[:parent_id].to_i) unless params[:parent_id].empty? - call_backend do - Internal.qprofile_service.setParent(profile_key, parent_key) - end - redirect_to :action => 'inheritance', :id => params[:id] - end - - # GET /profiles/changelog?key= - def changelog - require_parameters 'key' - - @profile = Internal.qprofile_loader.getByKey(params[:key]) - not_found('Quality profile does not exist') unless @profile - search = {'profileKey' => @profile.key().to_s, 'since' => params[:since], 'to' => params[:to], 'p' => params[:p]} - result = Internal.component(Java::OrgSonarServerActivity::RubyQProfileActivityService.java_class).search(search) - @changes = result.activities - @paging = result.paging - - set_profile_breadcrumbs - end - - # - # - # GET /profiles/permalinks?id= - # - # - def permalinks - require_parameters 'id' - @profile = Internal.quality_profiles.profile(params[:id].to_i) - not_found('Profile not found') unless @profile - set_profile_breadcrumbs - end - - - # - # - # GET /profiles/projects/ - # - # - def projects - require_parameters 'id' - - call_backend do - @profile = Internal.quality_profiles.profile(params[:id].to_i) - not_found('Profile not found') unless @profile - projects = Internal.quality_profiles.projects(params[:id].to_i) - @projects = Api::Utils.insensitive_sort(projects.to_a) { |p| p.name } - set_profile_breadcrumbs - end - end - - - # POST /profiles/add_project?id=&project= - def add_project - verify_post_request - require_parameters 'id', 'project' - - project_id = Api::Utils.project_id(params[:project]) - profile_id = params[:id].to_i - - call_backend do - Internal.quality_profiles.addProject(profile_id, project_id.to_i) - end - redirect_to :action => 'projects', :id => profile_id - end - - # POST /profiles/remove_project?id=&project= - def remove_project - verify_post_request - require_parameters 'id', 'project' - - profile_id = params[:id].to_i - call_backend do - Internal.quality_profiles.removeProject(profile_id, params[:project].to_i) - end - redirect_to :action => 'projects', :id => profile_id - end - - # POST /profiles/remove_projects?id= - def remove_projects - verify_post_request - require_parameters 'id' - - profile_id = params[:id].to_i - call_backend do - Internal.quality_profiles.removeAllProjects(profile_id) - end - redirect_to :action => 'projects', :id => profile_id - end - - # GET /profiles/rename_form?id= - def rename_form - require_parameters 'id' - call_backend do - @profile = Internal.quality_profiles.profile(params[:id].to_i) - not_found('Profile not found') unless @profile - end - render :partial => 'profiles/rename_form' - end - - # POST /profiles/rename?id=&name= - def rename - verify_post_request - verify_ajax_request - require_parameters 'id' - - call_backend do - profile_key = profile_id_to_key(params[:id].to_i) - Internal.qprofile_service.rename(profile_key, params[:new_name]) - end - render :text => 'ok', :status => 200 - end - - # GET /profiles/compare?id1=&id2= - def compare - @profiles = Profile.all(:order => 'language asc, name') - id1 = params[:id1] - id2 = params[:id2] - if id1.present? && id2.present? && id1.respond_to?(:to_i) && id2.respond_to?(:to_i) - @id1 = params[:id1].to_i - @id2 = params[:id2].to_i - @profile1 = Profile.find(id1) - @profile2 = Profile.find(id2) - - arules1 = ActiveRule.all(:include => [{:active_rule_parameters => :rules_parameter}, :rule], - :conditions => ['active_rules.profile_id=?', @profile1.id]) - arules2 = ActiveRule.all(:order => 'rules.plugin_name, rules.plugin_rule_key', :include => [{:active_rule_parameters => :rules_parameter}, :rule], - :conditions => ['active_rules.profile_id=?', @profile2.id]) - - arules1.reject! { |arule| arule.rule.removed? } - arules2.reject! { |arule| arule.rule.removed? } - - diffs_by_rule={} - arules1.each do |arule1| - diffs_by_rule[arule1.rule]||=RuleDiff.new(arule1.rule) - diffs_by_rule[arule1.rule].arule1=arule1 - end - arules2.each do |arule2| - diffs_by_rule[arule2.rule]||=RuleDiff.new(arule2.rule) - diffs_by_rule[arule2.rule].arule2=arule2 - end - @in1=[] - @in2=[] - @modified=[] - @sames=[] - diffs_by_rule.values.sort.each do |diff| - case diff.status - when DIFF_IN1 then - @in1<(other) - rule.name()<=>other.rule.name - end - end - - # - # Remove active rules that are identical in both collections (same severity and same parameters) - # and return a map with results {:added => X, :removed => Y, :modified => Z, - # :rules => {rule1 => [activeruleleft1, activeruleright1], rule2 => [activeruleleft2, nil], ...]} - # Assume both collections are ordered by rule key - # - def compute_diff(arules1, arules2) - rules = {} - removed = 0 - added = 0 - modified = 0 - same = 0 - begin - diff = false - #take first item of each collection - active_rule1 = arules1.first - active_rule2 = arules2.first - if active_rule1 != nil and active_rule2 != nil - order = active_rule1.rule.key <=> active_rule2.rule.key - if order < 0 - active_rule2 = nil - rule = active_rule1.rule - diff = true - removed = removed +1 - elsif order > 0 - active_rule1 = nil - rule = active_rule2.rule - diff = true - added = added +1 - else - rule = active_rule1.rule # = active_rule2.rule - #compare severity - diff = true if active_rule1.priority != active_rule2.priority - #compare parameters - rule.parameters.each do |param| - diff = true if active_rule1.value(param.id) != active_rule2.value(param.id) - end - if diff - modified = modified + 1 - else - same = same +1 - end - end - elsif active_rule1 != nil - #no more rule in right collection - diff = true - removed = removed +1 - rule = active_rule1.rule - elsif active_rule2 != nil - #no more rule in left collection - diff = true - added = added +1 - rule = active_rule2.rule - end - # remove processed rule(s) - arules1 = arules1.drop(1) if active_rule1 != nil - arules2 = arules2.drop(1) if active_rule2 != nil - if diff - rules[rule] = [active_rule1, active_rule2] - end - end while !arules1.empty? || !arules2.empty? - return {:same => same, :added => added, :removed => removed, :modified => modified, :rules => rules} - end - - def flash_messages(messages) - # only 4 messages are kept each time to avoid cookie overflow. - if messages.hasErrors() - flash[:error]=messages.getErrors().to_a[0...4].join('
    ') - end - if messages.hasWarnings() - flash[:warning]=messages.getWarnings().to_a[0...4].join('
    ') - end - if messages.hasInfos() - flash[:notice]=messages.getInfos().to_a[0...4].join('
    ') - end - end - - def flash_result(result) - # only 4 messages are kept each time to avoid cookie overflow. - unless result.infos.empty? - flash[:notice] += '
    ' + result.infos.to_a[0...4].join('
    ') - end - unless result.warnings.empty? - flash[:warning] = result.warnings.to_a[0...4].join('
    ') - end - - end - - def set_profile_breadcrumbs - add_breadcrumbs ProfilesController::root_breadcrumb, {:name => "#{@profile.name} (#{Api::Utils.language_name(@profile.language)})"} + def show + render :action => 'index' end - def profile_id_to_key(profile_id) - profile = Profile.find(profile_id) - not_found('Profile not found') unless profile - profile.kee - end end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/quality_profiles_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/quality_profiles_controller.rb deleted file mode 100644 index 3c84dc757c5..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/quality_profiles_controller.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# SonarQube, open source software quality management tool. -# Copyright (C) 2008-2014 SonarSource -# mailto:contact AT sonarsource DOT com -# -# SonarQube 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. -# -# SonarQube 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. -# - -class QualityProfilesController < ApplicationController - - SECTION=Navigation::SECTION_QUALITY_PROFILES - - def index - - end - - def show - render :action => 'index' - end - -end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_copy_form.html.erb similarity index 95% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_copy_form.html.erb index 71520b05840..0205415bb39 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_copy_form.html.erb @@ -1,4 +1,4 @@ -
    +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_create_form.html.erb similarity index 93% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_create_form.html.erb index a003c054478..2e006597e9c 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_create_form.html.erb @@ -2,7 +2,7 @@ language = controller.java_facade.getLanguages().find { |l| l.getKey()==language_key } importers = Internal.component(Java::OrgSonarServerQualityprofile::QProfileExporters.java_class).findProfileImportersForLanguage(language_key) %> - +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_diff_rule.html.erb similarity index 100% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_diff_rule.html.erb diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_new.html.erb similarity index 92% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_new.html.erb index 529fae5ef3e..bb170e96ff5 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_new.html.erb @@ -44,7 +44,7 @@ <%= submit_tag message('create') %> - <%= message('cancel') -%> + <%= message('cancel') -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_rename_form.html.erb similarity index 91% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_rename_form.html.erb index cf0f9053583..823859f3d7e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_rename_form.html.erb @@ -1,4 +1,4 @@ - +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_built_in_form.html.erb similarity index 88% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_built_in_form.html.erb index b483ce1ad51..96a4477a407 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_built_in_form.html.erb @@ -1,4 +1,4 @@ - +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_form.html.erb similarity index 85% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_form.html.erb index 8fcae1336f2..4ea22e736bc 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_restore_form.html.erb @@ -1,4 +1,4 @@ - +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_tabs.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_tabs.html.erb new file mode 100644 index 00000000000..3d6e5d8d68c --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/_tabs.html.erb @@ -0,0 +1,26 @@ +<% + new_tab = nil unless defined?(:new_tab) + selected_tab = nil unless defined?(:selected_tab) +%> + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/changelog.html.erb similarity index 91% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/changelog.html.erb index f807ae791c2..1f81c67c241 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/changelog.html.erb @@ -2,13 +2,13 @@

    <%= h @profile.name -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    -<%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'changelog'} %> +<%= render :partial => 'old_profiles/tabs', :locals => {:selected_tab=>'changelog'} %>
    - + <%= message('quality_profiles.changelog_from') -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/compare.html.erb similarity index 88% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/compare.html.erb index 54051821fc1..00d2bf2a137 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/compare.html.erb @@ -2,7 +2,7 @@

    <%= h message('quality_profiles.compare_profiles') -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    @@ -52,7 +52,7 @@ <%= message('quality_profiles.x_rules_only_in', :params => @in1.size) %> - <%= h @profile1.name %> + <%= h @profile1.name %> @@ -79,7 +79,7 @@ <%= message('quality_profiles.x_rules_only_in', :params => @in2.size) %> - <%= h @profile2.name %> + <%= h @profile2.name %> @@ -103,11 +103,11 @@ <%= message('quality_profiles.x_rules_have_different_configuration', :params =>@modified.size) -%>
    -     <%= h @profile1.name %> + <%= h @profile1.name %> -
    <%= h @profile2.name %> +
    <%= h @profile2.name %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/edit.html.erb similarity index 100% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/edit.html.erb diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/index.html.erb new file mode 100644 index 00000000000..c499adf0d9f --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/index.html.erb @@ -0,0 +1,133 @@ +
    + +
    +

    <%= h message('quality_profiles.page') -%>

    + +
    +
    + <%= message('quality_profiles.compare_profiles') -%> + + <% if profiles_administrator? %> + <%= message('quality_profiles.restore_profile') -%> + + <% end %> +
    +
    +
    + +<% + Api::Utils.insensitive_sort(languages){|l| l.getName()}.each do |language| + default_profile = Internal.component(Java::OrgSonarServerQualityprofile::QProfileService.java_class).getDefault(language.getKey()) +%> +
    + <% if profiles_administrator? %> + + + <% end %> +

    <%= message('quality_profiles.x_language_profiles', :params => language.getName()) -%>

    +
    + + + + + + + + + <% if profiles_administrator? %> + + <% end %> + + + + <% @profiles.select { |p| p.language == language.getKey() }.each do |profile| + projects_count = projects_count(profile) + is_default_profile = default_profile && default_profile.key()==profile.key() + %> + + + + + + + + + + + <% if profiles_administrator? %> + + + + + + <% end %> + + <% end %> + +
    <%= message('name') -%><%= message('rules') -%><%= message('projects') -%><%= message('default') -%><%= message('operations') -%>
    + <%= h profile.name() -%> + + <% + rules_tooltip = message('quality_profiles.see_rules_tooltip_x_profile', :params => [profile.name()]) + rules_tooltip = message('quality_profiles.manage_rules_tooltip_x_profile', :params => [profile.name()]) if profiles_administrator? + %> + " + title="<%= rules_tooltip %>"> + + <%= @active_rule_counts[profile.key()] || 0 -%> + + + + <% unless is_default_profile %> + <%= projects_count -%> + <% end %> + + <% if !is_default_profile && profiles_administrator? %> + <%= link_to_action message('set_as_default'), "#{ApplicationController.root_context}/old_profiles/set_as_default?id=#{profile.id()}", + :id => "activate_#{profile.key().parameterize}", + :class => 'link-action', + :confirm_title => message('set_as_default'), + :confirm_msg => message('quality_profiles.are_you_sure_want_x_profile_as_default', :params => [profile.name()]), + :confirm_button => message('set_as_default') + -%> + <% end %> + <% if is_default_profile %> + + <% end %> + + + + <%= message('backup_verb') -%> + + + <%= message('rename') -%> + + <%= message('copy') -%> + + <% if !is_default_profile %> + <%= link_to_action message('delete'), "#{ApplicationController.root_context}/old_profiles/delete/#{profile.id()}", + :class => 'link-action link-red', + :id => "delete_#{profile.key().parameterize}", + :confirm_button => message('delete'), + :confirm_title => 'quality_profiles.delete_confirm_title', + :confirm_msg => 'quality_profiles.are_you_sure_want_delete_profile_x_and_descendants', + :confirm_msg_params => [profile.name()] + -%> + <% end %> +
    +

    +<% end %> +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/inheritance.html.erb similarity index 89% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/inheritance.html.erb index bb97f911286..167b0514725 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/inheritance.html.erb @@ -2,11 +2,11 @@

    <%= h @profile.name -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    -<%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'inheritance'} %> +<%= render :partial => 'old_profiles/tabs', :locals => {:selected_tab=>'inheritance'} %>
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/new.html.erb similarity index 100% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/new.html.erb diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/permalinks.html.erb similarity index 63% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/permalinks.html.erb index 1115c25e20a..8eb479138dd 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/permalinks.html.erb @@ -2,11 +2,11 @@

    <%= h @profile.name -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    -<%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'Permalinks'} %> +<%= render :partial => 'old_profiles/tabs', :locals => {:selected_tab=>'Permalinks'} %>
    <% exporters = Internal.qprofile_exporters.exportersForLanguage(@profile.language()) %> @@ -18,7 +18,7 @@ <%= message('quality_profiles.export_all_rules') -%> - <% permalink = url_for :controller => 'profiles', :action => 'export', :language => @profile.language(), :name => url_encode(@profile.name()), :only_path => false %> + <% permalink = url_for :controller => 'old_profiles', :action => 'export', :language => @profile.language(), :name => url_encode(@profile.name()), :only_path => false %> <%= link_to permalink, permalink %> @@ -28,7 +28,7 @@ <%= h exporter.getName() -%> - <% permalink=url_for :controller => 'profiles', :action => 'export', :language => @profile.language(), :name => url_encode(@profile.name()), :format => exporter.getKey(), :only_path => false %> + <% permalink=url_for :controller => 'old_profiles', :action => 'export', :language => @profile.language(), :name => url_encode(@profile.name()), :format => exporter.getKey(), :only_path => false %> <%= link_to permalink, permalink, :id => "export_" + exporter.getKey().to_s + "_" + @profile.key() %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/projects.html.erb similarity index 88% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/projects.html.erb index 063c90027f1..66467b695cf 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/projects.html.erb @@ -2,15 +2,15 @@

    <%= h @profile.name -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    -<%= render :partial => 'profiles/tabs', :locals => {:selected_tab => 'Projects'} %> +<%= render :partial => 'old_profiles/tabs', :locals => {:selected_tab => 'Projects'} %>
    <% if profiles_administrator? %> -
    + Add project: <%= resource_select_tag 'project', { @@ -37,7 +37,7 @@ <%= link_to_action message('quality_profiles.remove_project_action'), - "#{ApplicationController.root_context}/profiles/remove_project?id=#{@profile.id}&project=#{project.id}", + "#{ApplicationController.root_context}/old_profiles/remove_project?id=#{@profile.id}&project=#{project.id}", :class => 'link-action', :id => "link-remove-#{project.key.parameterize}", :confirm_title => 'quality_profiles.remove_project_confirm_title', @@ -54,7 +54,7 @@ <%= link_to_action message('quality_profiles.remove_projects_action'), - "#{ApplicationController.root_context}/profiles/remove_projects?id=#{@profile.id}", + "#{ApplicationController.root_context}/old_profiles/remove_projects?id=#{@profile.id}", :class => 'link-action', :id => "link-remove-projects", :confirm_title => 'quality_profiles.remove_projects_confirm_title', diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/show.html.erb similarity index 93% rename from server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb rename to server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/show.html.erb index f7fe266b8e3..677e6bb1475 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/old_profiles/show.html.erb @@ -2,11 +2,11 @@

    <%= h @profile.name -%>

    - ← <%= h message('quality_profiles.page') -%> + ← <%= h message('quality_profiles.page') -%>
    - <%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'Rules'} %> + <%= render :partial => 'old_profiles/tabs', :locals => {:selected_tab=>'Rules'} %>
    <% active_rules = @stats.get('countActiveRules').get(0).getValue() if @stats && @stats.get('countActiveRules') %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb deleted file mode 100644 index d11fd395eb8..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<% - new_tab = nil unless defined?(:new_tab) - selected_tab = nil unless defined?(:selected_tab) -%> - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index 9c8488a8835..3084e764ef1 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -1,133 +1,5 @@ -
    - -
    -

    <%= h message('quality_profiles.page') -%>

    - -
    -
    - <%= message('quality_profiles.compare_profiles') -%> - - <% if profiles_administrator? %> - <%= message('quality_profiles.restore_profile') -%> - - <% end %> -
    -
    -
    - -<% - Api::Utils.insensitive_sort(languages){|l| l.getName()}.each do |language| - default_profile = Internal.component(Java::OrgSonarServerQualityprofile::QProfileService.java_class).getDefault(language.getKey()) -%> -
    - <% if profiles_administrator? %> - - - <% end %> -

    <%= message('quality_profiles.x_language_profiles', :params => language.getName()) -%>

    -
    - - - - - - - - - <% if profiles_administrator? %> - - <% end %> - - - - <% @profiles.select { |p| p.language == language.getKey() }.each do |profile| - projects_count = projects_count(profile) - is_default_profile = default_profile && default_profile.key()==profile.key() - %> - - - - - - - - - - - <% if profiles_administrator? %> - - - - - - <% end %> - - <% end %> - -
    <%= message('name') -%><%= message('rules') -%><%= message('projects') -%><%= message('default') -%><%= message('operations') -%>
    - <%= h profile.name() -%> - - <% - rules_tooltip = message('quality_profiles.see_rules_tooltip_x_profile', :params => [profile.name()]) - rules_tooltip = message('quality_profiles.manage_rules_tooltip_x_profile', :params => [profile.name()]) if profiles_administrator? - %> - " - title="<%= rules_tooltip %>"> - - <%= @active_rule_counts[profile.key()] || 0 -%> - - - - <% unless is_default_profile %> - <%= projects_count -%> - <% end %> - - <% if !is_default_profile && profiles_administrator? %> - <%= link_to_action message('set_as_default'), "#{ApplicationController.root_context}/profiles/set_as_default?id=#{profile.id()}", - :id => "activate_#{profile.key().parameterize}", - :class => 'link-action', - :confirm_title => message('set_as_default'), - :confirm_msg => message('quality_profiles.are_you_sure_want_x_profile_as_default', :params => [profile.name()]), - :confirm_button => message('set_as_default') - -%> - <% end %> - <% if is_default_profile %> - - <% end %> - - - - <%= message('backup_verb') -%> - - - <%= message('rename') -%> - - <%= message('copy') -%> - - <% if !is_default_profile %> - <%= link_to_action message('delete'), "#{ApplicationController.root_context}/profiles/delete/#{profile.id()}", - :class => 'link-action link-red', - :id => "delete_#{profile.key().parameterize}", - :confirm_button => message('delete'), - :confirm_title => 'quality_profiles.delete_confirm_title', - :confirm_msg => 'quality_profiles.are_you_sure_want_delete_profile_x_and_descendants', - :confirm_msg_params => [profile.name()] - -%> - <% end %> -
    -

    +<% content_for :script do %> + <% end %> -
    + +
    diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_profiles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_profiles/index.html.erb deleted file mode 100644 index 3084e764ef1..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_profiles/index.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% content_for :script do %> - -<% end %> - -
    diff --git a/server/sonar-web/src/test/js/quality-profiles.js b/server/sonar-web/src/test/js/quality-profiles.js index 3a1d118178e..d5088ab82a5 100644 --- a/server/sonar-web/src/test/js/quality-profiles.js +++ b/server/sonar-web/src/test/js/quality-profiles.js @@ -29,7 +29,7 @@ lib.configureCasper(); casper.test.begin(testName('Should Show List'), 9, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -71,7 +71,7 @@ casper.test.begin(testName('Should Show List'), 9, function (test) { casper.test.begin(testName('Should Show Details'), 9, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -119,7 +119,7 @@ casper.test.begin(testName('Should Show Details'), 9, function (test) { casper.test.begin(testName('Should Show Inheritance Details'), 10, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); lib.mockRequestFromFile('/api/qualityprofiles/search', 'search-inheritance.json'); @@ -169,7 +169,7 @@ casper.test.begin(testName('Should Show Inheritance Details'), 10, function (tes casper.test.begin(testName('Should Show Selected Projects'), 2, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -214,7 +214,7 @@ casper.test.begin(testName('Should Show Selected Projects'), 2, function (test) casper.test.begin(testName('Copy Profile'), 5, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -272,7 +272,7 @@ casper.test.begin(testName('Copy Profile'), 5, function (test) { casper.test.begin(testName('Rename Profile'), 2, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -330,7 +330,7 @@ casper.test.begin(testName('Rename Profile'), 2, function (test) { casper.test.begin(testName('Make Profile Default'), 4, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -382,7 +382,7 @@ casper.test.begin(testName('Make Profile Default'), 4, function (test) { casper.test.begin(testName('Delete Profile'), 2, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search-with-copy.json'); @@ -437,7 +437,7 @@ casper.test.begin(testName('Delete Profile'), 2, function (test) { casper.test.begin(testName('Create Profile'), 2, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); @@ -492,7 +492,7 @@ casper.test.begin(testName('Create Profile'), 2, function (test) { casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search-modified.json'); @@ -546,7 +546,7 @@ casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) { casper.test.begin(testName('Change Parent'), 1, function (test) { casper - .start(lib.buildUrl('quality_profiles'), function () { + .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search-change-parent.json'); diff --git a/server/sonar-web/src/test/views/quality_profiles.jade b/server/sonar-web/src/test/views/profiles.jade similarity index 100% rename from server/sonar-web/src/test/views/quality_profiles.jade rename to server/sonar-web/src/test/views/profiles.jade -- 2.39.5