SONAR-5718 Enable facets from query

diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index a88af9064201149227ef0e1f417150d7f72f0468..a5424edb81bb25eef457b54f1ade08c75ed739d6 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -13,6 +13,8 @@ define [
   $ = jQuery
   EXTRA_FIELDS = 'actions,transitions,assigneeName,reporterName,actionPlanName'
   PAGE_SIZE = 50
+  ALL_FACETS = ['severities', 'statuses', 'resolutions', 'componentRootUuids', 'assignees', 'reporters', 'rules',
+                'languages', 'actionPlans', 'componentUuids', 'creationDate']
   FACET_DATA_FIELDS = ['components', 'projects', 'users', 'rules', 'actionPlans']
   FACETS_FROM_SERVER = ['severities', 'statuses', 'resolutions', 'actionPlans', 'componentRootUuids', 'rules',
                         'assignees', 'reporters', 'componentUuids', 'languages']
@@ -34,11 +36,18 @@ define [
 
 
     _allFacets: ->
-      @options.app.state.get('allFacets').map (facet) -> { property: facet }
+      ALL_FACETS.map (facet) -> { property: facet }
 
 
-    _facetsFromServer: ->
+    _enabledFacets: ->
       facets = @options.app.state.get 'facets'
+      criteria = Object.keys @options.app.state.get 'query'
+      facets = facets.concat criteria
+      facets.filter (facet) -> ALL_FACETS.indexOf(facet) != -1
+
+
+    _facetsFromServer: ->
+      facets = @_enabledFacets()
       facets.filter (facet) -> FACETS_FROM_SERVER.indexOf(facet) != -1
 
 
@@ -60,7 +69,7 @@ define [
         FACET_DATA_FIELDS.forEach (field) => @options.app.facets[field] = r[field]
         @options.app.facets.reset @_allFacets()
         @options.app.facets.add r.facets, merge: true
-        @enableFacets @options.app.state.get 'facets'
+        @enableFacets @_enabledFacets()
 
         @options.app.state.set
           page: r.p

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 887b988f8aac919c67215fe1c592f358b6e95c04..264e81ad2e1cd2da1f74f8dd2b0582bb3294eaa5 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/models/state.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/state.coffee
@@ -13,8 +13,6 @@ define [
       query: {}
 
       facets: ['severities', 'statuses', 'resolutions']
-      allFacets: ['severities', 'statuses', 'resolutions', 'componentRootUuids', 'assignees', 'reporters', 'rules',
-                  'languages', 'actionPlans', 'componentUuids', 'creationDate']
 
 
     nextPage: ->