Refactor3

Apromore-Boot/src/main/resources/application.properties

@@ -56,7 +56,7 @@ management.security.enabled=false
 
 manager.ehcache.config.url=classpath:ehcache.xml
 
-portal.menuitemorder.File=Upload,Download,ETLPlugin,Export log as CSV,Create folder,Create model,Create model (legacy editor),Edit model,Edit model (legacy editor),Rename,Delete
+portal.menuitemorder.File=Upload,Download,Create data pipeline,Manage data pipelines,Export log as CSV,Create folder,Create model,Create model (legacy editor),Edit model,Edit model (legacy editor),Rename,Delete
 portal.menuorder=About,File,Discover,Analyze,Redesign,Implement,Monitor,Account
 
 security.basic.enabled=false

Apromore-Core-Components/Apromore-Portal/src/main/java/org/apromore/portal/dialogController/MenuController.java

@@ -64,6 +64,7 @@ public class MenuController extends SelectorComposer<Menubar> {
 
   private Menuitem aboutMenuitem;
   private Menuitem targetMenuitem;
+  private Menuitem etlMenuItem;
 
   @Override
   public void doAfterCompose(Menubar menubar) {
@@ -154,6 +155,9 @@ public void onEvent(Event event) throws Exception {
         if ("Create folder".equals(menuitem.getClientDataAttribute("itemCode"))) {
           targetMenuitem = menuitem;
         }
+        if ("Create data pipeline".equals(menuitem.getClientDataAttribute("itemCode"))) {
+          etlMenuItem = menuitem;
+        }
 
         // Insert the menu item into the appropriate position within the menu
         // (As configured in site.properties in the case of the File menu, alphabetically otherwise)
@@ -228,6 +232,10 @@ public void onEvent(Event event) throws Exception {
             sep = new Menuseparator();
             fileMenupopup.insertBefore(sep, targetMenuitem);
 
+            if (etlMenuItem != null) {
+              sep = new Menuseparator();
+              fileMenupopup.insertBefore(sep, etlMenuItem);
+            }
           } catch (Exception e) {
             LOGGER.error("Ignored exception during main menu construction", e);
           }