summaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/coffee
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-12-18 15:17:57 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-12-22 10:46:42 +0100
commit4b69d42d7f83aa22853dffbf2b49acda85c7ef99 (patch)
tree9a92219c8ebc0afeade341755e7ba92ded6502f3 /server/sonar-web/src/main/coffee
parent2b6c121e6764b6baf106c94767d8daedd85b7839 (diff)
downloadsonarqube-4b69d42d7f83aa22853dffbf2b49acda85c7ef99.tar.gz
sonarqube-4b69d42d7f83aa22853dffbf2b49acda85c7ef99.zip
SONAR-5820 Create a new coding rules page
Diffstat (limited to 'server/sonar-web/src/main/coffee')
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/app.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/app.coffee)44
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/layout.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/layout.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/mockjax.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/mockjax.coffee)0
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/router.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/router.coffee)0
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/actions-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/actions-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-dropdown-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-custom-rule-creation-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-debt-popup-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rule-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rules-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profile-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profiles-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee)14
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-facets-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-empty-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-item-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee)4
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee)4
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-manual-rule-creation-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-manual-rule-creation-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-parameter-popup-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-parameter-popup-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-quality-profile-activation-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filter-bar-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filter-bar-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/activation-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/active-severities-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/characteristic-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee)0
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/inheritance-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/language-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/profile-dependent-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee)0
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/quality-profile-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/query-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/repository-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/filters/tag-filter-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee)0
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules-old/views/header-view.coffee (renamed from server/sonar-web/src/main/coffee/coding-rules/views/header-view.coffee)2
-rw-r--r--server/sonar-web/src/main/coffee/issues/app.coffee8
-rw-r--r--server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee18
-rw-r--r--server/sonar-web/src/main/coffee/issues/controller.coffee136
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets-view.coffee23
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee4
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee65
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee4
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/tag-facet.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/filters-view.coffee20
-rw-r--r--server/sonar-web/src/main/coffee/issues/layout.coffee14
-rw-r--r--server/sonar-web/src/main/coffee/issues/models/state.coffee40
-rw-r--r--server/sonar-web/src/main/coffee/issues/router.coffee19
-rw-r--r--server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee43
-rw-r--r--server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee3
-rw-r--r--server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee76
53 files changed, 155 insertions, 444 deletions
diff --git a/server/sonar-web/src/main/coffee/coding-rules/app.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/app.coffee
index 953c0091080..26878007d07 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/app.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/app.coffee
@@ -19,21 +19,21 @@ requirejs.config
requirejs [
'backbone', 'backbone.marionette',
- 'coding-rules/layout',
- 'coding-rules/router',
+ 'coding-rules-old/layout',
+ 'coding-rules-old/router',
# views
- 'coding-rules/views/header-view',
- 'coding-rules/views/actions-view',
- 'coding-rules/views/filter-bar-view',
- 'coding-rules/views/coding-rules-list-view',
- 'coding-rules/views/coding-rules-detail-view',
- 'coding-rules/views/coding-rules-bulk-change-view',
- 'coding-rules/views/coding-rules-quality-profile-activation-view',
- 'coding-rules/views/coding-rules-bulk-change-dropdown-view',
- 'coding-rules/views/coding-rules-facets-view',
- 'coding-rules/views/coding-rules-custom-rule-creation-view',
- 'coding-rules/views/coding-rules-manual-rule-creation-view',
+ 'coding-rules-old/views/header-view',
+ 'coding-rules-old/views/actions-view',
+ 'coding-rules-old/views/filter-bar-view',
+ 'coding-rules-old/views/coding-rules-list-view',
+ 'coding-rules-old/views/coding-rules-detail-view',
+ 'coding-rules-old/views/coding-rules-bulk-change-view',
+ 'coding-rules-old/views/coding-rules-quality-profile-activation-view',
+ 'coding-rules-old/views/coding-rules-bulk-change-dropdown-view',
+ 'coding-rules-old/views/coding-rules-facets-view',
+ 'coding-rules-old/views/coding-rules-custom-rule-creation-view',
+ 'coding-rules-old/views/coding-rules-manual-rule-creation-view',
# filters
'navigator/filters/base-filters',
@@ -41,15 +41,15 @@ requirejs [
'navigator/filters/string-filters',
'navigator/filters/date-filter-view',
'navigator/filters/read-only-filters',
- 'coding-rules/views/filters/query-filter-view',
- 'coding-rules/views/filters/quality-profile-filter-view',
- 'coding-rules/views/filters/inheritance-filter-view',
- 'coding-rules/views/filters/active-severities-filter-view',
- 'coding-rules/views/filters/activation-filter-view',
- 'coding-rules/views/filters/characteristic-filter-view',
- 'coding-rules/views/filters/repository-filter-view',
- 'coding-rules/views/filters/tag-filter-view',
- 'coding-rules/views/filters/language-filter-view',
+ 'coding-rules-old/views/filters/query-filter-view',
+ 'coding-rules-old/views/filters/quality-profile-filter-view',
+ 'coding-rules-old/views/filters/inheritance-filter-view',
+ 'coding-rules-old/views/filters/active-severities-filter-view',
+ 'coding-rules-old/views/filters/activation-filter-view',
+ 'coding-rules-old/views/filters/characteristic-filter-view',
+ 'coding-rules-old/views/filters/repository-filter-view',
+ 'coding-rules-old/views/filters/tag-filter-view',
+ 'coding-rules-old/views/filters/language-filter-view',
'common/handlebars-extensions'
], (
diff --git a/server/sonar-web/src/main/coffee/coding-rules/layout.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/layout.coffee
index 8008248f670..459c11d337f 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/layout.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/layout.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/mockjax.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/mockjax.coffee
index 30f37ba626b..30f37ba626b 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/mockjax.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/mockjax.coffee
diff --git a/server/sonar-web/src/main/coffee/coding-rules/router.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/router.coffee
index fe49b73dbbd..fe49b73dbbd 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/router.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/router.coffee
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/actions-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/actions-view.coffee
index b5f13553de5..b8559cb2639 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/actions-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-dropdown-view.coffee
index 27552173ff9..0a1ee73f23d 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-dropdown-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-view.coffee
index 299d8026f4f..16b2689db4b 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-bulk-change-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-custom-rule-creation-view.coffee
index 69df942c423..0efc2a00beb 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-custom-rule-creation-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-debt-popup-view.coffee
index c8882d87fb4..3331b7d3fab 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-debt-popup-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
'common/popup'
], (
Marionette
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rule-view.coffee
index 216704641ef..84c1f332153 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rule-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rules-view.coffee
index e43d4ca0e93..b5df8e77c0f 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-custom-rules-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'coding-rules/views/coding-rules-detail-custom-rule-view'
+ 'coding-rules-old/views/coding-rules-detail-custom-rule-view'
], (
Marionette
CodingRulesDetailCustomRuleView
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profile-view.coffee
index 7a1544bc9c4..ef8a98db380 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profile-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profiles-view.coffee
index 1a5a9f69462..b26bbeeef20 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-quality-profiles-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'coding-rules/views/coding-rules-detail-quality-profile-view'
+ 'coding-rules-old/views/coding-rules-detail-quality-profile-view'
], (
Marionette,
CodingRulesDetailQualityProfileView
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-view.coffee
index d9697a317d3..20bf8c789b5 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-detail-view.coffee
@@ -1,13 +1,13 @@
define [
'backbone'
'backbone.marionette'
- 'coding-rules/views/coding-rules-detail-quality-profiles-view'
- 'coding-rules/views/coding-rules-detail-quality-profile-view'
- 'coding-rules/views/coding-rules-detail-custom-rules-view'
- 'coding-rules/views/coding-rules-detail-custom-rule-view'
- 'coding-rules/views/coding-rules-parameter-popup-view'
- 'coding-rules/views/coding-rules-debt-popup-view'
- 'templates/coding-rules'
+ 'coding-rules-old/views/coding-rules-detail-quality-profiles-view'
+ 'coding-rules-old/views/coding-rules-detail-quality-profile-view'
+ 'coding-rules-old/views/coding-rules-detail-custom-rules-view'
+ 'coding-rules-old/views/coding-rules-detail-custom-rule-view'
+ 'coding-rules-old/views/coding-rules-parameter-popup-view'
+ 'coding-rules-old/views/coding-rules-debt-popup-view'
+ 'templates/coding-rules-old'
], (
Backbone
Marionette
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-facets-view.coffee
index a83094f7084..7a209398fff 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-facets-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-empty-view.coffee
index c3eb8d48c4e..a428e4cf256 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-empty-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-item-view.coffee
index 0c77a630538..6b46abada7e 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-item-view.coffee
@@ -1,7 +1,7 @@
define [
'backbone.marionette',
- 'coding-rules/views/coding-rules-detail-view',
- 'templates/coding-rules'
+ 'coding-rules-old/views/coding-rules-detail-view',
+ 'templates/coding-rules-old'
], (
Marionette,
CodingRulesDetailView,
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-view.coffee
index b62e4a28866..7669b57870c 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-list-view.coffee
@@ -1,7 +1,7 @@
define [
'backbone.marionette',
- 'coding-rules/views/coding-rules-list-item-view',
- 'coding-rules/views/coding-rules-list-empty-view'
+ 'coding-rules-old/views/coding-rules-list-item-view',
+ 'coding-rules-old/views/coding-rules-list-empty-view'
], (
Marionette,
CodingRulesListItemView,
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-manual-rule-creation-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-manual-rule-creation-view.coffee
index fdae346c422..5d48f9cd6a2 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-manual-rule-creation-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-manual-rule-creation-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-parameter-popup-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-parameter-popup-view.coffee
index 52ece5db2a9..cdee87966e5 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-parameter-popup-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-parameter-popup-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette'
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
'common/popup'
], (
Marionette
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-quality-profile-activation-view.coffee
index 9660c29a5c7..2d7f00aa7db 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/coding-rules-quality-profile-activation-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filter-bar-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filter-bar-view.coffee
index b01ee86ab85..edd69fb4d19 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filter-bar-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filter-bar-view.coffee
@@ -4,7 +4,7 @@ define [
'navigator/filters/favorite-filters',
'navigator/filters/more-criteria-filters',
'navigator/filters/read-only-filters',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
FilterBarView,
BaseFilters,
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/activation-filter-view.coffee
index da9e451a8c6..e6d33997d7e 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/activation-filter-view.coffee
@@ -1,5 +1,5 @@
define [
- 'coding-rules/views/filters/profile-dependent-filter-view'
+ 'coding-rules-old/views/filters/profile-dependent-filter-view'
], (
ProfileDependentFilterView
) ->
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/active-severities-filter-view.coffee
index 8cbe81e9e50..5c07e2333d9 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/active-severities-filter-view.coffee
@@ -1,6 +1,6 @@
define [
- 'coding-rules/views/filters/profile-dependent-filter-view'
+ 'coding-rules-old/views/filters/profile-dependent-filter-view'
], (
ProfileDependentFilterView
) ->
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/characteristic-filter-view.coffee
index efa29a733ff..efa29a733ff 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/characteristic-filter-view.coffee
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/inheritance-filter-view.coffee
index 145dc06267c..0a201375cf1 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/inheritance-filter-view.coffee
@@ -1,5 +1,5 @@
define [
- 'coding-rules/views/filters/profile-dependent-filter-view'
+ 'coding-rules-old/views/filters/profile-dependent-filter-view'
], (
ProfileDependentFilterView
) ->
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/language-filter-view.coffee
index b52dcb2bbbb..3e5ea0a5cdb 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/language-filter-view.coffee
@@ -1,6 +1,6 @@
define [
'navigator/filters/choice-filters',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
ChoiceFilters,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/profile-dependent-filter-view.coffee
index 5afad402b92..5afad402b92 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/profile-dependent-filter-view.coffee
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/quality-profile-filter-view.coffee
index d665930cbea..3dde4d0f0be 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/quality-profile-filter-view.coffee
@@ -1,6 +1,6 @@
define [
'navigator/filters/choice-filters',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
ChoiceFilters,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/query-filter-view.coffee
index ee8e70d044b..fa57264bd7a 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/query-filter-view.coffee
@@ -4,7 +4,7 @@ define [
'navigator/filters/base-filters',
'navigator/filters/string-filters',
'navigator/filters/choice-filters',
- 'templates/coding-rules',
+ 'templates/coding-rules-old',
'common/handlebars-extensions'
], (
Backbone,
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/repository-filter-view.coffee
index aeae2bea056..82dc8e675dd 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/repository-filter-view.coffee
@@ -1,6 +1,6 @@
define [
'navigator/filters/choice-filters',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
ChoiceFilters,
Templates
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/tag-filter-view.coffee
index 01366e7f2e4..01366e7f2e4 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/filters/tag-filter-view.coffee
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/header-view.coffee b/server/sonar-web/src/main/coffee/coding-rules-old/views/header-view.coffee
index caa03b54779..13a71b5e75d 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/header-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules-old/views/header-view.coffee
@@ -1,6 +1,6 @@
define [
'backbone.marionette',
- 'templates/coding-rules'
+ 'templates/coding-rules-old'
], (
Marionette,
Templates
diff --git a/server/sonar-web/src/main/coffee/issues/app.coffee b/server/sonar-web/src/main/coffee/issues/app.coffee
index 9ae6f8b3604..c40aeee41de 100644
--- a/server/sonar-web/src/main/coffee/issues/app.coffee
+++ b/server/sonar-web/src/main/coffee/issues/app.coffee
@@ -22,7 +22,7 @@ requirejs [
'issues/models/state'
'issues/layout'
'issues/models/issues'
- 'issues/models/facets'
+ 'components/navigator/models/facets'
'issues/models/filters'
'issues/controller'
@@ -70,7 +70,7 @@ requirejs [
App.addInitializer ->
@state = new State()
- @issues = new Issues()
+ @list = new Issues()
@facets = new Facets()
@filters = new Filters()
@@ -82,7 +82,7 @@ requirejs [
App.addInitializer ->
@issuesView = new WorkspaceListView
app: @
- collection: @issues
+ collection: @list
@layout.workspaceListRegion.show @issuesView
@issuesView.bindScrollEvents()
@@ -90,7 +90,7 @@ requirejs [
App.addInitializer ->
@workspaceHeaderView = new WorkspaceHeaderView
app: @
- collection: @issues
+ collection: @list
@layout.workspaceHeaderRegion.show @workspaceHeaderView
diff --git a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
index 88dbf3311a3..31f3c0baff5 100644
--- a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
@@ -52,11 +52,11 @@ define [
selectedIssueView.find(".js-issue-#{action}").click()
key 'up', 'componentViewer', =>
- @options.app.controller.selectPreviousIssue()
+ @options.app.controller.selectPrev()
false
key 'down', 'componentViewer', =>
- @options.app.controller.selectNextIssue()
+ @options.app.controller.selectNext()
false
key 'left', 'componentViewer', =>
@@ -88,7 +88,7 @@ define [
select: ->
selected = @options.app.state.get 'selectedIndex'
- selectedIssue = @options.app.issues.at selected
+ selectedIssue = @options.app.list.at selected
if selectedIssue.get('component') == @model.get('key')
@scrollToIssue selectedIssue.get('key')
else
@@ -99,7 +99,7 @@ define [
getSelectedIssueEl: ->
selected = @options.app.state.get 'selectedIndex'
return null unless selected?
- selectedIssue = @options.app.issues.at selected
+ selectedIssue = @options.app.list.at selected
return null unless selectedIssue?
selectedIssueView = @$("#issue-#{selectedIssue.get('key')}")
if selectedIssueView.length > 0 then selectedIssueView else null
@@ -108,7 +108,7 @@ define [
selectIssue: (e) ->
key = $(e.currentTarget).data 'issue-key'
issue = @issues.find (issue) -> issue.get('key') == key
- index = @options.app.issues.indexOf issue
+ index = @options.app.list.indexOf issue
@options.app.state.set selectedIndex: index
@@ -120,7 +120,7 @@ define [
else
@unbindShortcuts()
selected = @options.app.state.get 'selectedIndex'
- selectedIssue = @options.app.issues.at selected
+ selectedIssue = @options.app.list.at selected
@options.app.controller.showComponentViewer selectedIssue
@@ -149,11 +149,11 @@ define [
requestIssues: ->
- if @options.app.issues.last().get('component') == @model.get('key')
+ if @options.app.list.last().get('component') == @model.get('key')
r = @options.app.controller.fetchNextPage()
else r = $.Deferred().resolve().promise()
r.done =>
- @issues.reset @options.app.issues.filter (issue) => issue.get('component') == @model.key()
+ @issues.reset @options.app.list.filter (issue) => issue.get('component') == @model.key()
@issues.reset @limitIssues @issues
@addIssuesPerLineMeta @issues
@@ -174,7 +174,7 @@ define [
addNextIssuesPage: ->
componentKey = @model.get 'key'
- @issues.add @options.app.issues.filter (issue) => issue.get('component') == componentKey
+ @issues.add @options.app.list.filter (issue) => issue.get('component') == componentKey
scrollToLine: (line) ->
diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index d937228a9e8..4bc75e7d472 100644
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -1,10 +1,10 @@
define [
- 'backbone.marionette'
+ 'components/navigator/controller'
'issues/component-viewer/main'
'issues/component-viewer/state'
], (
- Marionette
+ Controller
ComponentViewer
ComponentViewerState
@@ -12,56 +12,33 @@ define [
$ = jQuery
EXTRA_FIELDS = 'actions,transitions,assigneeName,reporterName,actionPlanName'
- PAGE_SIZE = 50
- ALL_FACETS = ['severities', 'statuses', 'resolutions', 'projectUuids', 'moduleUuids', 'componentUuids', 'assignees', 'reporters', 'rules',
- 'tags', 'languages', 'actionPlans', 'creationDate', 'issues']
FACET_DATA_FIELDS = ['components', 'projects', 'users', 'rules', 'actionPlans', 'languages']
- FACETS_FROM_SERVER = ['severities', 'statuses', 'resolutions', 'actionPlans', 'projectUuids', 'rules', 'tags'
- 'assignees', 'reporters', 'componentUuids', 'languages']
- TRANSFORM = {
- 'resolved': 'resolutions'
- 'assigned': 'assignees'
- 'planned': 'actionPlans'
- 'createdAt': 'creationDate'
- 'createdBefore': 'creationDate'
- 'createdAfter': 'creationDate'
- }
- class extends Marionette.Controller
-
- initialize: (options) ->
- @listenTo options.app.state, 'change:query', @fetchIssues
-
+ class extends Controller
+ allFacets: ['severities', 'statuses', 'resolutions', 'projectUuids', 'moduleUuids', 'componentUuids', 'assignees',
+ 'reporters', 'rules', 'tags', 'languages', 'actionPlans', 'creationDate', 'issues'],
+ facetsFromServer: ['severities', 'statuses', 'resolutions', 'actionPlans', 'projectUuids', 'rules', 'tags',
+ 'assignees', 'reporters', 'componentUuids', 'languages'],
+ transform: {
+ 'resolved': 'resolutions'
+ 'assigned': 'assignees'
+ 'planned': 'actionPlans'
+ 'createdAt': 'creationDate'
+ 'createdBefore': 'creationDate'
+ 'createdAfter': 'creationDate'
+ },
_issuesParameters: ->
p: @options.app.state.get 'page'
- ps: PAGE_SIZE
+ ps: @pageSize
s: 'FILE_LINE'
asc: true
extra_fields: EXTRA_FIELDS
facets: @_facetsFromServer().join()
- _allFacets: ->
- ALL_FACETS.map (facet) -> { property: facet }
-
-
- _enabledFacets: ->
- facets = @options.app.state.get 'facets'
- criteria = Object.keys @options.app.state.get 'query'
- facets = facets.concat criteria
- facets = facets.map (facet) ->
- if TRANSFORM[facet]? then TRANSFORM[facet] else facet
- facets.filter (facet) -> ALL_FACETS.indexOf(facet) != -1
-
-
- _facetsFromServer: ->
- facets = @_enabledFacets()
- facets.filter (facet) -> FACETS_FROM_SERVER.indexOf(facet) != -1
-
-
- fetchIssues: (firstPage = true) ->
+ fetchList: (firstPage = true) ->
if firstPage
@options.app.state.set { selectedIndex: 0, page: 1 }, { silent: true }
@closeComponentViewer()
@@ -72,12 +49,12 @@ define [
fetchIssuesProcess = window.process.addBackgroundProcess()
$.get "#{baseUrl}/api/issues/search", data
.done (r) =>
- issues = @options.app.issues.parseIssues r
+ issues = @options.app.list.parseIssues r
if firstPage
- @options.app.issues.reset issues
+ @options.app.list.reset issues
else
- @options.app.issues.add issues
- @options.app.issues.setIndex()
+ @options.app.list.add issues
+ @options.app.list.setIndex()
FACET_DATA_FIELDS.forEach (field) => @options.app.facets[field] = r[field]
@options.app.facets.reset @_allFacets()
@options.app.facets.add r.facets, merge: true
@@ -92,11 +69,6 @@ define [
window.process.failBackgroundProcess fetchIssuesProcess
- fetchNextPage: ->
- @options.app.state.nextPage()
- @fetchIssues false
-
-
fetchFilters: ->
$.get "#{baseUrl}/api/issue_filters/app", (r) =>
@options.app.state.set
@@ -105,35 +77,6 @@ define [
@options.app.filters.reset r.favorites
- enableFacet: (id) ->
- facet = @options.app.facets.get id
- if facet.has('values') || FACETS_FROM_SERVER.indexOf(id) == -1
- facet.set enabled: true
- else
- p = window.process.addBackgroundProcess()
- @requestFacet(id)
- .done =>
- facet.set enabled: true
- window.process.finishBackgroundProcess p
- .fail ->
- window.process.failBackgroundProcess p
-
-
- disableFacet: (id) ->
- facet = @options.app.facets.get id
- facet.set enabled: false
- @options.app.facetsView.children.findByModel(facet).disable()
-
-
- toggleFacet: (id) ->
- facet = @options.app.facets.get id
- if facet.get('enabled') then @disableFacet(id) else @enableFacet(id)
-
-
- enableFacets: (facets) ->
- facets.forEach @enableFacet, @
-
-
_mergeCollections: (a, b) ->
collection = new Backbone.Collection a
collection.add b, merge: true
@@ -162,29 +105,17 @@ define [
@options.app.state.set filter: filter, changed: false
- parseQuery: (query, separator = '|') ->
- q = {}
- (query || '').split(separator).forEach (t) ->
- tokens = t.split('=')
- if tokens[0] && tokens[1]?
- q[tokens[0]] = decodeURIComponent tokens[1]
+ parseQuery: ->
+ q = super
# Do not allow to modify the sorting
delete q.asc
delete q.s
q
- getQuery: (separator = '|') ->
- filter = @options.app.state.get 'query'
- route = []
- _.map filter, (value, property) ->
- route.push "#{property}=#{encodeURIComponent value}"
- route.join separator
-
-
- getRoute: (separator = '|') ->
+ getRoute: ->
filter = @options.app.state.get 'filter'
- query = @getQuery separator
+ query = super
if filter?
if @options.app.state.get('changed') && query.length > 0
query = "id=#{filter.id}|#{query}"
@@ -220,20 +151,5 @@ define [
@options.app.layout.workspaceComponentViewerRegion.reset()
@options.app.layout.hideComponentViewer()
@options.app.issuesView.bindScrollEvents()
- @options.app.issuesView.scrollToIssue()
-
-
- selectNextIssue: ->
- index = @options.app.state.get('selectedIndex') + 1
- if index < @options.app.issues.length
- @options.app.state.set selectedIndex: index
- else
- unless @options.app.state.get('maxResultsReached')
- @fetchNextPage().done =>
- @options.app.state.set selectedIndex: index
-
+ @options.app.issuesView.scrollTo()
- selectPreviousIssue: ->
- index = @options.app.state.get('selectedIndex') - 1
- if index >= 0
- @options.app.state.set selectedIndex: index
diff --git a/server/sonar-web/src/main/coffee/issues/facets-view.coffee b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
index b030690c29b..78f0860d3d7 100644
--- a/server/sonar-web/src/main/coffee/issues/facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
@@ -1,5 +1,5 @@
define [
- 'backbone.marionette'
+ 'components/navigator/facets-view'
'issues/facets/base-facet'
'issues/facets/severity-facet'
@@ -17,7 +17,8 @@ define [
'issues/facets/language-facet'
'issues/facets/issue-key-facet'
], (
- Marionette
+ FacetsView
+
BaseFacet
SeverityFacet
StatusFacet
@@ -35,9 +36,7 @@ define [
IssueKeyFacet
) ->
- class extends Marionette.CollectionView
- className: 'issues-facets-list'
-
+ class extends FacetsView
getItemView: (model) ->
switch model.get 'property'
@@ -56,17 +55,3 @@ define [
when 'languages' then LanguageFacet
when 'issues' then IssueKeyFacet
else BaseFacet
-
-
- itemViewOptions: ->
- app: @options.app
-
-
- collectionEvents: ->
- 'change:enabled': 'updateState'
-
-
- updateState: ->
- enabledFacets = @collection.filter (model) -> model.get('enabled')
- enabledFacetIds = enabledFacets.map (model) -> model.id
- @options.app.state.set facets: enabledFacetIds
diff --git a/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
index 6ecc3a387be..4959fd2a728 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
@@ -17,7 +17,7 @@ define [
super
value = @options.app.state.get('query')['planned']
if value? && (!value || value == 'false')
- @$('.js-issues-facet').filter("[data-unplanned]").addClass 'active'
+ @$('.js-facet').filter("[data-unplanned]").addClass 'active'
toggleFacet: (e) ->
diff --git a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
index c2f1e99ac65..43c48eb193d 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
@@ -21,7 +21,7 @@ define [
super
value = @options.app.state.get('query')['assigned']
if value? && (!value || value == 'false')
- @$('.js-issues-facet').filter("[data-unassigned]").addClass 'active'
+ @$('.js-facet').filter("[data-unassigned]").addClass 'active'
toggleFacet: (e) ->
@@ -54,7 +54,7 @@ define [
addCustomValue: ->
property = @model.get 'property'
- customValue = @$('.js-issues-custom-value').select2 'val'
+ customValue = @$('.js-custom-value').select2 'val'
value = @getValue()
value += ',' if value.length > 0
value += customValue
diff --git a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
index b13643544b2..a9781dfcbe1 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
@@ -1,69 +1,10 @@
define [
- 'backbone.marionette'
+ 'components/navigator/facets/base-facet'
'templates/issues'
], (
- Marionette
+ BaseFacet
Templates
) ->
- $ = jQuery
-
-
- class extends Marionette.ItemView
- className: 'issues-facet-box'
+ class extends BaseFacet
template: Templates['issues-base-facet']
-
-
- modelEvents: ->
- 'change': 'render'
-
-
- events: ->
- 'click .js-issues-facet-toggle': 'toggle'
- 'click .js-issues-facet': 'toggleFacet'
-
-
- onRender: ->
- @$el.toggleClass 'issues-facet-box-collapsed', !@model.get('enabled')
-
- property = @model.get 'property'
- value = @options.app.state.get('query')[property]
- if typeof value == 'string'
- value.split(',').forEach (s) =>
- facet = @$('.js-issues-facet').filter("[data-value='#{s}']")
- if facet.length > 0
- parent = facet.parent()
- facet.addClass('active')#.detach().prependTo parent
-
-
- toggle: ->
- @options.app.controller.toggleFacet @model.id
-
-
- getValue: ->
- @$('.js-issues-facet.active').map(-> $(@).data 'value').get().join()
-
-
- toggleFacet: (e) ->
- $(e.currentTarget).toggleClass 'active'
- property = @model.get 'property'
- value = @getValue()
- obj = {}
- obj[property] = value
- @options.app.state.updateFilter obj
-
-
- disable: ->
- property = @model.get 'property'
- obj = {}
- obj[property] = null
- @options.app.state.updateFilter obj
-
-
- sortValues: (values) ->
- _.sortBy values, (v) -> -v.count
-
-
- serializeData: ->
- _.extend super,
- values: @sortValues @model.getValues()
diff --git a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
index 2fd4c8f53a6..21ed4e09a3d 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
@@ -19,7 +19,7 @@ define [
onRender: ->
- @$el.toggleClass 'issues-facet-box-collapsed', !@model.get('enabled')
+ @$el.toggleClass 'search-navigator-facet-box-collapsed', !@model.get('enabled')
@$('input').datepicker
dateFormat: 'yy-mm-dd'
diff --git a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
index 6a75a0cd776..6712695e8f2 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
@@ -13,7 +13,7 @@ define [
events: ->
_.extend super,
- 'change .js-issues-custom-value': 'addCustomValue'
+ 'change .js-custom-value': 'addCustomValue'
getUrl: ->
@@ -42,7 +42,7 @@ define [
addCustomValue: ->
property = @model.get 'property'
- customValue = @$('.js-issues-custom-value').select2 'val'
+ customValue = @$('.js-custom-value').select2 'val'
value = @getValue()
value += ',' if value.length > 0
value += customValue
diff --git a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
index b017d613157..ed3bb7e5450 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
@@ -18,7 +18,7 @@ define [
value = @options.app.state.get('query')['resolved']
if value? && (!value || value == 'false')
- @$('.js-issues-facet').filter("[data-unresolved]").addClass 'active'
+ @$('.js-facet').filter("[data-unresolved]").addClass 'active'
toggleFacet: (e) ->
diff --git a/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
index c4db10359f9..ec4a576d8ec 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
@@ -12,7 +12,7 @@ define [
languages = @options.app.state.get('query').languages
if languages?
url += "&languages=#{languages}"
- @$('.js-issues-custom-value').select2
+ @$('.js-custom-value').select2
placeholder: 'Search...'
minimumInputLength: 2
allowClear: false
diff --git a/server/sonar-web/src/main/coffee/issues/facets/tag-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/tag-facet.coffee
index 159c0169356..81b3c33f3f9 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/tag-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/tag-facet.coffee
@@ -12,7 +12,7 @@ define [
tags = @options.app.state.get('query').tags
if tags?
url += "&tags=#{tags}"
- @$('.js-issues-custom-value').select2
+ @$('.js-custom-value').select2
placeholder: 'Search...'
minimumInputLength: 0
allowClear: false
diff --git a/server/sonar-web/src/main/coffee/issues/filters-view.coffee b/server/sonar-web/src/main/coffee/issues/filters-view.coffee
index 21d07786b85..a1dfae26087 100644
--- a/server/sonar-web/src/main/coffee/issues/filters-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/filters-view.coffee
@@ -14,13 +14,13 @@ define [
events:
- 'click .js-issues-toggle-filters': 'toggleFilters'
- 'click .js-issues-filter': 'applyFilter'
- 'click #issues-new-search': 'newSearch'
- 'click #issues-filter-save-as': 'saveAs'
- 'click #issues-filter-save': 'save'
- 'click #issues-filter-copy': 'copy'
- 'click #issues-filter-edit': 'edit'
+ 'click .js-toggle-filters': 'toggleFilters'
+ 'click .js-filter': 'applyFilter'
+ 'click .js-new-search': 'newSearch'
+ 'click .js-filter-save-as': 'saveAs'
+ 'click .js-filter-save': 'save'
+ 'click .js-filter-copy': 'copy'
+ 'click .js-filter-edit': 'edit'
initialize: (options) ->
@@ -35,15 +35,15 @@ define [
onRender: ->
- @$el.toggleClass 'issues-filters-selected', @options.app.state.has('filter')
+ @$el.toggleClass 'search-navigator-filters-selected', @options.app.state.has('filter')
toggleFilters: (e) ->
e.stopPropagation()
- @$('.issues-filters-list').toggle()
+ @$('.search-navigator-filters-list').toggle()
$('body').on 'click.issues-filters', =>
$('body').off 'click.issues-filters'
- @$('.issues-filters-list').hide()
+ @$('.search-navigator-filters-list').hide()
applyFilter: (e) ->
diff --git a/server/sonar-web/src/main/coffee/issues/layout.coffee b/server/sonar-web/src/main/coffee/issues/layout.coffee
index a39d515384b..85d06a2a3f1 100644
--- a/server/sonar-web/src/main/coffee/issues/layout.coffee
+++ b/server/sonar-web/src/main/coffee/issues/layout.coffee
@@ -15,10 +15,10 @@ define [
regions:
- filtersRegion: '.issues-filters'
- facetsRegion: '.issues-facets'
- workspaceHeaderRegion: '.issues-workspace-header'
- workspaceListRegion: '.issues-workspace-list'
+ filtersRegion: '.search-navigator-filters'
+ facetsRegion: '.search-navigator-facets'
+ workspaceHeaderRegion: '.search-navigator-workspace-header'
+ workspaceListRegion: '.search-navigator-workspace-list'
workspaceComponentViewerRegion: '.issues-workspace-component-viewer'
@@ -31,13 +31,13 @@ define [
onRender: ->
- @$('.issues-side').isolatedScroll()
+ @$('.search-navigator-side').isolatedScroll()
onScroll: ->
scrollTop = $(window).scrollTop()
- $('.issues').toggleClass 'sticky', scrollTop >= @topOffset
- @$('.issues-side').css top: Math.max(0, Math.min(@topOffset - scrollTop, @topOffset))
+ $('.search-navigator').toggleClass 'sticky', scrollTop >= @topOffset
+ @$('.search-navigator-side').css top: Math.max(0, Math.min(@topOffset - scrollTop, @topOffset))
showSpinner: (region) ->
diff --git a/server/sonar-web/src/main/coffee/issues/models/state.coffee b/server/sonar-web/src/main/coffee/issues/models/state.coffee
index 49040ea3c79..197104042dd 100644
--- a/server/sonar-web/src/main/coffee/issues/models/state.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/state.coffee
@@ -1,48 +1,14 @@
define [
- 'backbone'
+ 'components/navigator/models/state'
], (
- Backbone
+ State
) ->
- class extends Backbone.Model
+ class extends State
defaults:
page: 1
maxResultsReached: false
-
query: {}
-
facets: ['severities', 'statuses', 'resolutions']
-
- nextPage: ->
- page = @get 'page'
- @set page: page + 1
-
-
- cleanQuery: (query) ->
- q = {}
- Object.keys(query).forEach (key) ->
- q[key] = query[key] if query[key]
- q
-
-
- _areQueriesEqual: (a, b) ->
- equal = Object.keys(a).length == Object.keys(b).length
- Object.keys(a).forEach (key) ->
- equal = equal && (a[key] == b[key])
- equal
-
-
- updateFilter: (obj) ->
- oldQuery = @get('query')
- query = _.extend {}, oldQuery, obj
- query = @cleanQuery query
- @setQuery query unless @_areQueriesEqual oldQuery, query
-
-
- setQuery: (query) ->
- @set { query: query }, { silent: true }
- @set changed: true
- @trigger 'change:query'
-
diff --git a/server/sonar-web/src/main/coffee/issues/router.coffee b/server/sonar-web/src/main/coffee/issues/router.coffee
index b85773f6c43..79057861a9b 100644
--- a/server/sonar-web/src/main/coffee/issues/router.coffee
+++ b/server/sonar-web/src/main/coffee/issues/router.coffee
@@ -1,21 +1,18 @@
define [
- 'backbone'
+ 'components/navigator/router'
], (
- Backbone
+ Router
) ->
- class extends Backbone.Router
- routeSeparator: '|'
-
+ class extends Router
routes:
'': 'emptyQuery'
':query': 'index'
initialize: (options) ->
- @options = options
- @listenTo @options.app.state, 'change:query', @updateRoute
- @listenTo @options.app.state, 'change:filter', @updateRoute
+ super
+ @listenTo options.app.state, 'change:filter', @updateRoute
emptyQuery: ->
@@ -36,9 +33,3 @@ define [
@options.app.controller.applyFilter filter
else
@options.app.state.setQuery query
-
-
- updateRoute: ->
- route = @options.app.controller.getRoute()
- @navigate route
-
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
index ec225348f47..696261ffab1 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
@@ -1,36 +1,29 @@
define [
- 'backbone.marionette'
+ 'components/navigator/workspace-header-view'
'templates/issues'
], (
- Marionette
+ WorkspaceHeaderView
Templates
) ->
$ = jQuery
- class extends Marionette.ItemView
+ class extends WorkspaceHeaderView
template: Templates['issues-workspace-header']
- collectionEvents:
- 'all': 'render'
-
-
- events:
- 'click .js-back': 'returnToList'
- 'click #issues-bulk-change': 'bulkChange'
- 'click #issues-reload': 'reloadIssues'
- 'click .js-issues-next': 'selectNextIssue'
- 'click .js-issues-prev': 'selectPrevIssue'
+ events: ->
+ _.extend super,
+ 'click .js-back': 'returnToList'
- initialize: (options) ->
- @listenTo options.app.state, 'change', @render
+ initialize: ->
+ super
@_onBulkIssues = window.onBulkIssues
window.onBulkIssues = =>
$('#modal').dialog 'close'
- @options.app.controller.fetchIssues()
+ @options.app.controller.fetchList()
onClose: ->
@@ -45,21 +38,3 @@ define [
query = @options.app.controller.getQuery '&'
url = "#{baseUrl}/issues/bulk_change_form?#{query}"
openModalWindow url, {}
-
-
- reloadIssues: ->
- @options.app.controller.fetchIssues()
-
-
- selectNextIssue: ->
- @options.app.controller.selectNextIssue()
-
-
- selectPrevIssue: ->
- @options.app.controller.selectPreviousIssue()
-
-
- serializeData: ->
- _.extend super,
- state: @options.app.state.toJSON()
-
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
index f6514ea9ff9..f77d383a31a 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
@@ -5,7 +5,7 @@ define [
) ->
class extends Marionette.ItemView
- className: 'issues-no-results'
+ className: 'search-navigator-no-results'
template: ->
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee
index d81b015538c..2e91d9053d3 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee
@@ -14,13 +14,14 @@ define [
initialize: (options) ->
+ super
@listenTo options.app.state, 'change:selectedIndex', @select
onRender: ->
super
- @$el.addClass 'issue-navigate-right'
@select()
+ @$el.addClass 'issue-navigate-right'
select: ->
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
index d52d55bf4d5..7b139ff35b1 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
@@ -1,10 +1,10 @@
define [
- 'backbone.marionette'
+ 'components/navigator/workspace-list-view'
'templates/issues'
'issues/workspace-list-item-view'
'issues/workspace-list-empty-view'
], (
- Marionette
+ WorkspaceListView
Templates
IssueView
EmptyView
@@ -17,50 +17,14 @@ define [
BOTTOM_OFFSET = 10
- class extends Marionette.CompositeView
+ class extends WorkspaceListView
template: Templates['issues-workspace-list']
componentTemplate: Templates['issues-workspace-list-component']
itemView: IssueView
- itemViewContainer: '.js-issues-list'
+ itemViewContainer: '.js-list'
emptyView: EmptyView
- ui:
- loadMore: '.js-issues-more'
-
-
- itemViewOptions: ->
- app: @options.app
-
-
- collectionEvents:
- 'reset': 'scrollToTop'
-
-
- initialize: ->
- @loadMoreThrottled = _.throttle @loadMore, 1000, { trailing: false }
- @listenTo @options.app.state, 'change:maxResultsReached', @toggleLoadMore
- @listenTo @options.app.state, 'change:selectedIndex', @scrollToIssue
- @bindShortcuts()
-
-
- onClose: ->
- @unbindScrollEvents()
- @unbindShortcuts()
-
-
- toggleLoadMore: ->
- @ui.loadMore.toggle !@options.app.state.get 'maxResultsReached'
-
-
- bindScrollEvents: ->
- $(window).on 'scroll.issues-workspace-list', (=> @onScroll())
-
-
- unbindScrollEvents: ->
- $(window).off 'scroll.issues-workspace-list'
-
-
bindShortcuts: ->
doTransition = (transition) =>
selectedIssue = @collection.at @options.app.state.get 'selectedIndex'
@@ -74,13 +38,7 @@ define [
selectedIssueView = @children.findByModel selectedIssue
selectedIssueView.$(".js-issue-#{action}").click()
- key 'up', 'list', =>
- @options.app.controller.selectPreviousIssue()
- false
-
- key 'down', 'list', =>
- @options.app.controller.selectNextIssue()
- false
+ super
key 'right,return', 'list', =>
selectedIssue = @collection.at @options.app.state.get 'selectedIndex'
@@ -101,29 +59,7 @@ define [
key 't', 'list', -> doAction 'edit-tags'
- loadMore: ->
- unless @options.app.state.get 'maxResultsReached'
- @unbindScrollEvents()
- @options.app.controller.fetchNextPage().done => @bindScrollEvents()
-
-
- disablePointerEvents: ->
- clearTimeout @scrollTimer
- $('body').addClass 'disabled-pointer-events'
- @scrollTimer = setTimeout (-> $('body').removeClass 'disabled-pointer-events'), 250
-
-
- onScroll: ->
- @disablePointerEvents()
- if $(window).scrollTop() + $(window).height() >= @ui.loadMore.offset().top
- @loadMoreThrottled()
-
-
- scrollToTop: ->
- @$el.scrollParent().scrollTop 0
-
-
- scrollToIssue: ->
+ scrollTo: ->
selectedIssue = @collection.at @options.app.state.get 'selectedIndex'
return unless selectedIssue?
selectedIssueView = @children.findByModel selectedIssue