From 19094a0c94d551e59466274ce5115e192dfd264a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 15 Apr 2015 11:14:43 +0200 Subject: [PATCH] SONAR-5851 use importers when create a profile --- .../quality-profiles-create-profile.hbs | 16 +++-- .../main/js/quality-profiles/actions-view.js | 20 ++++-- .../quality-profiles/create-profile-view.js | 70 +++++++++++++------ .../sonar-web/src/test/js/quality-profiles.js | 68 ++++++++++++++++-- .../quality-profiles/importers-empty.json | 3 + .../test/json/quality-profiles/importers.json | 19 +++++ 6 files changed, 162 insertions(+), 34 deletions(-) create mode 100644 server/sonar-web/src/test/json/quality-profiles/importers-empty.json create mode 100644 server/sonar-web/src/test/json/quality-profiles/importers.json diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs index e44f29d4de5..50fbc195fff 100644 --- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs +++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs @@ -1,4 +1,5 @@ -
+

{{t 'quality_profiles.new_profile'}}

@@ -6,16 +7,23 @@
- +
-
+
- {{#each languages}} {{/each}}
+ {{#each importers}} +
+ + +

{{t 'quality_profiles.optional_configuration_file'}}

+
+ {{/each}}
diff --git a/server/sonar-web/src/main/js/quality-profiles/actions-view.js b/server/sonar-web/src/main/js/quality-profiles/actions-view.js index 4d0653c3f57..9cb0e2d3f98 100644 --- a/server/sonar-web/src/main/js/quality-profiles/actions-view.js +++ b/server/sonar-web/src/main/js/quality-profiles/actions-view.js @@ -52,10 +52,11 @@ define([ create: function () { var that = this; - this.requestLanguages().done(function (r) { + $.when(this.requestLanguages(), this.requestImporters()).done(function () { new CreateProfileView({ collection: that.collection, - languages: r.languages + languages: that.languages, + importers: that.importers }).render(); }); }, @@ -77,8 +78,19 @@ define([ }, requestLanguages: function () { - var url = baseUrl + '/api/languages/list'; - return $.get(url); + var that = this, + url = baseUrl + '/api/languages/list'; + return $.get(url).done(function (r) { + that.languages = r.languages; + }); + }, + + requestImporters: function () { + var that = this, + url = baseUrl + '/api/qualityprofiles/importers'; + return $.get(url).done(function (r) { + that.importers = r.importers; + }); }, serializeData: function () { diff --git a/server/sonar-web/src/main/js/quality-profiles/create-profile-view.js b/server/sonar-web/src/main/js/quality-profiles/create-profile-view.js index 89d25107816..e6045f31716 100644 --- a/server/sonar-web/src/main/js/quality-profiles/create-profile-view.js +++ b/server/sonar-web/src/main/js/quality-profiles/create-profile-view.js @@ -19,18 +19,25 @@ */ define([ 'common/modal-form', + 'common/file-upload', 'quality-profiles/profile', 'templates/quality-profiles' -], function (ModalFormView, Profile) { +], function (ModalFormView, uploader, Profile) { var $ = jQuery; return ModalFormView.extend({ template: Templates['quality-profiles-create-profile'], + events: function () { + return _.extend(ModalFormView.prototype.events.apply(this, arguments), { + 'change #create-profile-language': 'onLanguageChange' + }); + }, + onFormSubmit: function (e) { ModalFormView.prototype.onFormSubmit.apply(this, arguments); - this.sendRequest(); + this.sendRequest(e); }, onRender: function () { @@ -39,28 +46,36 @@ define([ width: '250px', minimumResultsForSearch: 50 }); + this.onLanguageChange(); }, - sendRequest: function () { - var that = this, - url = baseUrl + '/api/qualityprofiles/create', - options = { - language: this.$('#create-profile-language').val(), - name: this.$('#create-profile-name').val() - }; - return $.ajax({ - type: 'POST', - url: url, - data: options, - statusCode: { - // do not show global error - 400: null + onLanguageChange: function () { + var that = this; + var language = this.$('#create-profile-language').val(); + var importers = this.getImportersForLanguages(language); + this.$('.js-importer').each(function () { + that.emptyInput($(this)); + $(this).addClass('hidden'); + }); + importers.forEach(function (importer) { + that.$('.js-importer[data-key="' + importer.key + '"]').removeClass('hidden'); + }); + }, + + emptyInput: function (e) { + e.wrap('').closest('form').get(0).reset(); + e.unwrap(); + }, + + sendRequest: function (e) { + var that = this; + uploader({ form: $(e.currentTarget) }).done(function (r) { + if (_.isArray(r.errors) || _.isArray(r.warnings)) { + that.showErrors(r.errors, r.warnings); + } else { + that.addProfile(r.profile); + that.close(); } - }).done(function (r) { - that.addProfile(r.profile); - that.close(); - }).fail(function (jqXHR) { - that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); }); }, @@ -70,9 +85,20 @@ define([ profile.trigger('select', profile); }, + getImportersForLanguages: function (language) { + if (language != null) { + return this.options.importers.filter(function (importer) { + return importer.languages.indexOf(language) !== -1; + }); + } else { + return []; + } + }, + serializeData: function () { return _.extend(ModalFormView.prototype.serializeData.apply(this, arguments), { - languages: this.options.languages + languages: this.options.languages, + importers: this.options.importers }); } }); diff --git a/server/sonar-web/src/test/js/quality-profiles.js b/server/sonar-web/src/test/js/quality-profiles.js index 062be0179d8..5fcb523b39f 100644 --- a/server/sonar-web/src/test/js/quality-profiles.js +++ b/server/sonar-web/src/test/js/quality-profiles.js @@ -519,10 +519,8 @@ casper.test.begin(testName('Create Profile'), 2, function (test) { this.searchMock = lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); lib.mockRequestFromFile('/api/rules/search', 'rules.json'); lib.mockRequestFromFile('/api/qualityprofiles/inheritance', 'inheritance.json'); - lib.mockRequestFromFile('/api/qualityprofiles/create', 'create.json', { - data: { language: 'java', name: 'Copied Profile' } - }); lib.mockRequestFromFile('/api/languages/list', 'languages.json'); + lib.mockRequestFromFile('/api/qualityprofiles/importers', 'importers-empty.json'); }) .then(function () { @@ -555,7 +553,69 @@ casper.test.begin(testName('Create Profile'), 2, function (test) { }) .then(function () { - test.assertExists('.js-list .list-group-item.active[data-key="java-copied-profile-11711"]'); + test.assert(true); + }) + + .then(function () { + lib.sendCoverage(); + }) + + .run(function () { + test.done(); + }); +}); + + +casper.test.begin(testName('Importers'), 6, function (test) { + casper + .start(lib.buildUrl('profiles'), function () { + lib.setDefaultViewport(); + + lib.mockRequestFromFile('/api/users/current', 'user-admin.json'); + lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json'); + lib.mockRequestFromFile('/api/rules/search', 'rules.json'); + lib.mockRequestFromFile('/api/qualityprofiles/inheritance', 'inheritance.json'); + lib.mockRequestFromFile('/api/languages/list', 'languages.json'); + lib.mockRequestFromFile('/api/qualityprofiles/importers', 'importers.json'); + }) + + .then(function () { + casper.evaluate(function () { + require(['/js/quality-profiles/app.js']); + jQuery.ajaxSetup({ dataType: 'json' }); + }); + }) + + .then(function () { + casper.waitForSelector('.js-list .list-group-item'); + }) + + .then(function () { + casper.click('#quality-profiles-create'); + casper.waitForSelector('.modal'); + }) + + .then(function () { + test.assertVisible('.js-importer[data-key="pmd"]'); + test.assertVisible('.js-importer[data-key="random"]'); + + casper.evaluate(function () { + jQuery('#create-profile-language').val('js').change(); + }); + }) + + .then(function () { + test.assertNotVisible('.js-importer[data-key="pmd"]'); + test.assertVisible('.js-importer[data-key="random"]'); + + casper.evaluate(function () { + jQuery('#create-profile-language').val('py').change(); + }); + }) + + .then(function () { + test.assertNotVisible('.js-importer[data-key="pmd"]'); + test.assertNotVisible('.js-importer[data-key="random"]'); }) .then(function () { diff --git a/server/sonar-web/src/test/json/quality-profiles/importers-empty.json b/server/sonar-web/src/test/json/quality-profiles/importers-empty.json new file mode 100644 index 00000000000..b00cdebb50e --- /dev/null +++ b/server/sonar-web/src/test/json/quality-profiles/importers-empty.json @@ -0,0 +1,3 @@ +{ + "importers": [] +} diff --git a/server/sonar-web/src/test/json/quality-profiles/importers.json b/server/sonar-web/src/test/json/quality-profiles/importers.json new file mode 100644 index 00000000000..68d254909cb --- /dev/null +++ b/server/sonar-web/src/test/json/quality-profiles/importers.json @@ -0,0 +1,19 @@ +{ + "importers": [ + { + "key": "pmd", + "name": "PMD", + "languages": [ + "java" + ] + }, + { + "key": "random", + "name": "Random", + "languages": [ + "java", + "js" + ] + } + ] +} -- 2.39.5