Routes refactored, conflicts resolved

ui/src/app/edge/edge.routes.js

@@ -21,8 +21,6 @@ import devicesTemplate from "../device/devices.tpl.html";
 import assetsTemplate from "../asset/assets.tpl.html";
 import dashboardsTemplate from "../dashboard/dashboards.tpl.html";
 import dashboardTemplate from "../dashboard/dashboard.tpl.html";
-import ruleChainsTemplate from "../rulechain/rulechains.tpl.html";
-import ruleChainTemplate from "../rulechain/rulechain.tpl.html";
 
 /* eslint-enable import/no-unresolved, import/default */
 
@@ -180,62 +178,5 @@ export default function EdgeRoutes($stateProvider, types) {
             ncyBreadcrumb: {
                 label: '{"icon": "router", "label": "{{ vm.customerEdgesTitle }}", "translate": "false"}'
             }
-        }).state('home.edges.ruleChains', {
-            url: '/:edgeId/ruleChains',
-            params: {'topIndex': 0},
-            module: 'private',
-            auth: ['TENANT_ADMIN'],
-            views: {
-                "content@home": {
-                    templateUrl: ruleChainsTemplate,
-                    controllerAs: 'vm',
-                    controller: 'RuleChainsController'
-                }
-            },
-            data: {
-                searchEnabled: true,
-                pageTitle: 'edge.rulechain-templates',
-                ruleChainsType: 'edge'
-            },
-            ncyBreadcrumb: {
-                label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}'
-            }
-        }).state('home.edges.ruleChains.ruleChain', {
-            url: '/:ruleChainId',
-            reloadOnSearch: false,
-            module: 'private',
-            auth: ['SYS_ADMIN', 'TENANT_ADMIN'],
-            views: {
-                "content@home": {
-                    templateUrl: ruleChainTemplate,
-                    controller: 'RuleChainController',
-                    controllerAs: 'vm'
-                }
-            },
-            resolve: {
-                ruleChain:
-                /*@ngInject*/
-                    function($stateParams, ruleChainService) {
-                        return ruleChainService.getRuleChain($stateParams.ruleChainId);
-                    },
-                ruleChainMetaData:
-                /*@ngInject*/
-                    function($stateParams, ruleChainService) {
-                        return ruleChainService.getRuleChainMetaData($stateParams.ruleChainId);
-                    },
-                ruleNodeComponents:
-                /*@ngInject*/
-                    function($stateParams, ruleChainService) {
-                        return ruleChainService.getRuleNodeComponents(types.ruleChainType.edge);
-                    }
-            },
-            data: {
-                import: false,
-                searchEnabled: false,
-                pageTitle: 'edge.rulechain-templates'
-            },
-            ncyBreadcrumb: {
-                label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
-            }
         });
 }

ui/src/app/rulechain/rulechain.controller.js

@@ -1272,7 +1272,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
                                 if (vm.ruleChain.type === vm.types.ruleChainType.core) {
                                     $state.go('home.ruleChains.ruleChain', {ruleChainId: vm.ruleChain.id.id});
                                 } else {
-                                    $state.go('home.edges.edgeRuleChains.ruleChain', {ruleChainId: vm.ruleChain.id.id});
+                                    $state.go('home.edges.ruleChains.ruleChain', {ruleChainId: vm.ruleChain.id.id});
                                 }
                             });
                         } else {

ui/src/app/rulechain/rulechain.routes.js

@@ -125,7 +125,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         ncyBreadcrumb: {
             label: '{"icon": "settings_ethernet", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}'
         }
-    }).state('home.edges.edgeRuleChains', {
+    }).state('home.edges.ruleChains', {
         url: '/ruleChains',
         params: {'topIndex': 0},
         module: 'private',
@@ -145,7 +145,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         ncyBreadcrumb: {
             label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}'
         }
-    }).state('home.edges.edgeRuleChains.ruleChain', {
+    }).state('home.edges.ruleChains.ruleChain', {
         url: '/:ruleChainId',
         reloadOnSearch: false,
         module: 'private',
@@ -182,7 +182,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         ncyBreadcrumb: {
             label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
         }
-    }).state('home.edges.edgeRuleChains.importRuleChain', {
+    }).state('home.edges.ruleChains.importRuleChain', {
         url: '/edges/ruleChains/import',
         reloadOnSearch: false,
         module: 'private',

ui/src/app/rulechain/rulechains.controller.js

@@ -247,7 +247,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
                 onAction: function ($event) {
                     importExport.importRuleChain($event, types.ruleChainType.edge).then(
                         function(ruleChainImport) {
-                            $state.go('home.edges.edgeRuleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.ruleChainType.edge});
+                            $state.go('home.edges.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.ruleChainType.edge});
                         }
                     );
                 },
@@ -401,7 +401,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
         if (vm.ruleChainsScope === 'edge') {
             $state.go('home.edges.ruleChains.ruleChain', Object.assign(ruleChainParams, edgeId = vm.edge.id.id));
         } else if (vm.ruleChainsScope === 'edges') {
-            $state.go('home.edges.edgeRuleChains.ruleChain', ruleChainParams);
+            $state.go('home.edges.ruleChains.ruleChain', ruleChainParams);
         } else {
             $state.go('home.ruleChains.ruleChain', ruleChainParams);
         }

ui/src/app/services/menu.service.js

@@ -202,7 +202,7 @@ function Menu(userService, $state, $rootScope) {
                                     {
                                         name: 'edge.rulechain-templates',
                                         type: 'link',
-                                        state: 'home.edges.edgeRuleChains',
+                                        state: 'home.edges.ruleChains',
                                         icon: 'settings_ethernet'
                                     }
                                 ]
@@ -293,7 +293,7 @@ function Menu(userService, $state, $rootScope) {
                                 {
                                     name: 'edge.rulechain-templates',
                                     icon: 'settings_ethernet',
-                                    state: 'home.edges.edgeRuleChains'
+                                    state: 'home.edges.ruleChains'
                                 }
                             ]
 

ui/src/app/widget/lib/edges-overview-widget.js

@@ -57,8 +57,8 @@ function EdgesOverviewWidgetController($scope, $translate, types, utils, entityS
         types.entityType.device,
         types.entityType.entityView,
         types.entityType.dashboard,
-        types.entityType.rulechain,
-    ]
+        types.entityType.rulechain
+    ];
 
     vm.onNodeSelected = onNodeSelected;
 
@@ -121,7 +121,7 @@ function EdgesOverviewWidgetController($scope, $translate, types, utils, entityS
                         cb([]);
                     }
                 }
-            )
+            );
         } else {
             cb([]);
         }