Fixes #13379: Update menu registering for plugins

auth-backends/src/main/scala/com/normation/plugins/authbackends/AuthBackendsPluginDef.scala

@@ -58,20 +58,12 @@ class AuthBackendsPluginDef(override val status: PluginStatus) extends DefaultPl
 
   val configFiles = Seq(ClassPathResource("auth-backends.properties"))
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val authBackendsMenu = (
-      Menu("authBackensdManagement", <span>Authentication Backends</span>) /
-        "secure" / "administration" / "authBackendsManagement"
-        >> LocGroup("administrationGroup")
-        >> TestAccess ( () => Boot.userIsAllowed("/secure/administration/policyServerManagement", Administration.Read))
-        >> Template(() => ClasspathTemplates("template" :: "AuthBackendsManagement" :: Nil ) openOr <div>Template not found</div>)
+  override def pluginMenuEntry: Option[Menu] = {
+    Some(Menu("authBackensdManagement", <span>Authentication Backends</span>) /
+      "secure" / "plugins" / "authBackendsManagement"
+      >> LocGroup("pluginsGroup")
+      >> TestAccess ( () => Boot.userIsAllowed("/secure/index", Administration.Read))
+      >> Template(() => ClasspathTemplates("template" :: "AuthBackendsManagement" :: Nil ) openOr <div>Template not found</div>)
     )
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ authBackendsMenu:_* )
-      case m => m
-    }
   }
-
 }

branding/src/main/scala/com/normation/plugins/branding/BrandingPluginDef.scala

@@ -61,20 +61,13 @@ class BrandingPluginDef(override val status: PluginStatus) extends DefaultPlugin
 
   val configFiles = Seq()
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val brandingMenu = (
-      Menu("brandingManagement", <span>Branding</span>) /
+  override def pluginMenuEntry: Option[Menu] = {
+    Some(Menu("brandingManagement", <span>Branding</span>) /
         "secure" / "administration" / "brandingManagement"
         >> LocGroup("administrationGroup")
         >> TestAccess ( () => Boot.userIsAllowed("/secure/administration/policyServerManagement", Administration.Read) )
         >> Template(() => ClasspathTemplates( "template" :: "brandingManagement" :: Nil ) openOr <div>Template not found</div>)
     )
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ brandingMenu:_* )
-      case m => m
-    }
   }
 
 }

changes-validation/src/main/scala/com/normation/plugins/changesvalidation/ChangesValidationPluginDef.scala

@@ -57,20 +57,13 @@ class ChangesValidationPluginDef(override val status: PluginStatus) extends Defa
 
   val configFiles = Seq()
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val changesValidationMenu = (
-      Menu("changesValidationManagement", <span>Changes Validation</span>) /
-        "secure" / "administration" / "changesValidationManagement"
-        >> LocGroup("administrationGroup")
-        >> TestAccess ( () => Boot.userIsAllowed("/secure/administration/policyServerManagement", Administration.Read))
-        >> Template(() => ClasspathTemplates("template" :: "ChangesValidationManagement" :: Nil ) openOr <div>Template not found</div>)
+  override def pluginMenuEntry: Option[Menu] = {
+    Some(Menu("changesValidationManagement", <span>Changes Validation</span>) /
+      "secure" / "plugins" / "changesValidationManagement"
+      >> LocGroup("pluginsGroup")
+      >> TestAccess ( () => Boot.userIsAllowed("/secure/index", Administration.Read))
+      >> Template(() => ClasspathTemplates("template" :: "ChangesValidationManagement" :: Nil ) openOr <div>Template not found</div>)
     )
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ changesValidationMenu:_* )
-      case m => m
-    }
   }
 
 }

datasources/src/main/scala/com/normation/plugins/datasources/DataSourcesPluginDef.scala

@@ -63,20 +63,13 @@ class DataSourcesPluginDef(override val status: PluginStatus) extends DefaultPlu
 
   val configFiles = Seq()
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val datasourceMenu = (
-      Menu("dataSourceManagement", <span>Data sources</span>) /
-        "secure" / "administration" / "dataSourceManagement"
-        >> LocGroup("administrationGroup")
-        >> TestAccess ( () => Boot.userIsAllowed("/secure/administration/policyServerManagement", Administration.Read) )
-        >> Template(() => ClasspathTemplates( "template" :: "dataSourceManagement" :: Nil ) openOr <div>Template not found</div>)
+  override def pluginMenuEntry : Option[Menu] = {
+    Some(Menu("dataSourceManagement", <span>Data sources</span>) /
+      "secure" / "plugins" / "dataSourceManagement"
+      >> LocGroup("pluginsGroup")
+      >> TestAccess ( () => Boot.userIsAllowed("/secure/index", Administration.Read) )
+      >> Template(() => ClasspathTemplates( "template" :: "dataSourceManagement" :: Nil ) openOr <div>Template not found</div>)
     )
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ datasourceMenu:_* )
-      case m => m
-    }
   }
 
 }

helloworld/src/main/scala/com/normation/plugins/helloworld/HelloWorldPluginDef.scala

@@ -34,20 +34,14 @@ class HelloWorldPluginDef(dbService:LogAccessInDb) extends RudderPluginDef with
 
   def oneTimeInit : Unit = {}
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val helloLoc =
-      Menu("HelloPluginConfig") / "secure" / "administration" / "helloplugin" >>
-        Title( x => <span>HelloPlugin</span>) >>
-        LocGroup("administrationGroup") >>
-        Template(() =>
-          ClasspathTemplates( "helloPlugin" :: Nil ) openOr
-          <div>Template not found</div>)
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ helloLoc:_* )
-      case m => m
-    }
+  override def updateSiteMap: Option[Menu] = {
+    Some(Menu("HelloPluginConfig") / "secure" / "administration" / "helloplugin" >>
+      Title( x => <span>HelloPlugin</span>) >>
+      LocGroup("administrationGroup") >>
+      Template(() =>
+        ClasspathTemplates( "helloPlugin" :: Nil ) openOr
+        <div>Template not found</div>)
+    )
   }
 
 }

main-build.conf

@@ -22,4 +22,4 @@ lib-common-private=1.0
 
 # Version of Rudder used to build the plugin.
 # It defined the API/ABI used and it is important for binary compatibility
-rudder-build-version=5.0.0~alpha1-SNAPSHOT
+rudder-build-version=5.0.0~beta2-SNAPSHOT

node-external-reports/src/main/scala/com/normation/plugins/nodeexternalreports/NodeExternalReportPluginDef.scala

@@ -62,19 +62,13 @@ class NodeExternalReportsPluginDef(api: NodeExternalReportApi, override val stat
 
   def oneTimeInit : Unit = {}
 
-  override def updateSiteMap(menus:List[Menu]) : List[Menu] = {
-    val loc =
-      Menu("nodeExternalReportInfo", <span>Node External Reports</span>) / "secure" / "administration" / "nodeexternalreports" >>
-        LocGroup("administrationGroup") >>
-        Template(() =>
-          ClasspathTemplates( "nodeExternalReports" :: Nil ) openOr
-          <div>Template not found</div>)
-
-    menus.map {
-      case m@Menu(l, _* ) if(l.name == "AdministrationHome") =>
-        Menu(l , m.kids.toSeq :+ loc:_* )
-      case m => m
-    }
+  override def pluginMenuEntry: Option[Menu] = {
+    Some(Menu("nodeExternalReportInfo", <span>Node External Reports</span>) / "secure" / "plugins" / "nodeexternalreports" >>
+      LocGroup("pluginsGroup") >>
+      Template(() =>
+        ClasspathTemplates( "nodeExternalReports" :: Nil ) openOr
+        <div>Template not found</div>)
+    )
   }
 
 }