SONAR-5345 use new WS parameters

5 files changed, 9 insertions, 19 deletions

diff --git a/server/sonar-web/src/main/coffee/issues/app-context.coffee b/server/sonar-web/src/main/coffee/issues/app-context.coffee
index 1da25433957..c1f688369b7 100644
--- a/server/sonar-web/src/main/coffee/issues/app-context.coffee
+++ b/server/sonar-web/src/main/coffee/issues/app-context.coffee
@@ -44,7 +44,7 @@ requirejs [
 
 
   App.getContextQuery = ->
-    componentRootUuids: window.config.resource
+    componentUuids: window.config.resource
 
 
   App.getRestrictedFacets = ->
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 063a447554b..564e8d1f477 100644
--- a/server/sonar-web/src/main/coffee/issues/facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
@@ -12,7 +12,7 @@ define [
   'issues/facets/resolution-facet'
   'issues/facets/creation-date-facet'
   'issues/facets/action-plan-facet'
-  'issues/facets/component-facet'
+  'issues/facets/file-facet'
   'issues/facets/reporter-facet'
   'issues/facets/language-facet'
   'issues/facets/issue-key-facet'
@@ -31,7 +31,7 @@ define [
   ResolutionFacet
   CreationDateFacet
   ActionPlanFacet
-  ComponentFacet
+  FileFacet
   ReporterFacet
   LanguageFacet
   IssueKeyFacet
@@ -52,7 +52,7 @@ define [
         when 'rules' then RuleFacet
         when 'tags' then TagFacet
         when 'actionPlans' then ActionPlanFacet
-        when 'componentUuids' then ComponentFacet
+        when 'fileUuids' then FileFacet
         when 'reporters' then ReporterFacet
         when 'languages' then LanguageFacet
         when 'issues' then IssueKeyFacet
diff --git a/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/file-facet.coffee
index 9fd341da3ee..74faa70029c 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/file-facet.coffee
@@ -9,7 +9,7 @@ define [
 
 
   class extends BaseFacet
-    template: Templates['issues-component-facet']
+    template: Templates['issues-file-facet']
 
 
     onRender: ->
diff --git a/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
index 2c0370db850..881fd1a22e7 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
@@ -11,18 +11,8 @@ define [
       "#{baseUrl}/api/resources/search?f=s2&q=BRC&display_uuid=true"
 
 
-    getValues: ->
-      componentRoots = @options.app.state.get('query').moduleUuids
-      componentRoots = '' unless typeof componentRoots == typeof ''
-      if componentRoots.length > 0
-        componentRoots = componentRoots.split ','
-        componentRoots.map (c) ->
-          { val: c, count: null }
-      else []
-
-
     getValuesWithLabels: ->
-      values = @getValues()
+      values = @model.getValues()
       components = @options.app.facets.components
       values.forEach (v) =>
         uuid = v.val
@@ -36,4 +26,4 @@ define [
 
     serializeData: ->
       _.extend super,
-        values: @getValuesWithLabels()
+        values: @sortValues @getValuesWithLabels()
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 6e51ab6c163..a685a95b43f 100644
--- a/server/sonar-web/src/main/coffee/issues/models/state.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/state.coffee
@@ -11,10 +11,10 @@ define [
       isContext: false
 
       allFacets: ['issues', 'severities', 'statuses', 'resolutions', 'projectUuids', 'moduleUuids', 'directories',
-                  'componentUuids', 'assignees', 'reporters', 'rules', 'tags', 'languages', 'actionPlans',
+                  'fileUuids', 'assignees', 'reporters', 'rules', 'tags', 'languages', 'actionPlans',
                   'creationDate'],
       facetsFromServer: ['severities', 'statuses', 'resolutions', 'actionPlans', 'projectUuids', 'directories', 'rules',
-                         'tags', 'assignees', 'reporters', 'componentUuids', 'languages'],
+                         'moduleUuids', 'tags', 'assignees', 'reporters', 'fileUuids', 'languages'],
       transform: {
         'resolved': 'resolutions'
         'assigned': 'assignees'