frontend: move link definitions to javascript layer

backend/src/appenlight/lib/configurator.py

@@ -71,7 +71,6 b' def register_appenlight_plugin(config, plugin_name, plugin_config):'
                 'javascript': None,
                 'static': None,
                 'css': None,
-                'top_nav': None,
                 'celery_tasks': None,
                 'celery_beats': None,
                 'fulltext_indexer': None,

backend/src/appenlight/static/js/appenlight.js

@@ -2744,6 +2744,7 b' var pluginsToLoad = _.map(decodeEncodedJSON(window.AE.plugins),'
     function(item){
         return item.config.angular_module
     });
+console.info(pluginsToLoad);
 
 angular.module('appenlight.plugins', pluginsToLoad);
 
@@ -2815,6 +2816,14 b' function kickstartAE(initialUserData) {'
         function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig) {
             if (initialUserData){
                 stateHolder.AeUser.update(initialUserData);
+
+                if (stateHolder.AeUser.hasAppPermission('root_administration'
+                )){
+                    AeConfig.topNav.menuAdminItems.push(
+                        {'sref': 'admin', 'label': 'Admin Settings'}
+                    )
+                }
+
             }
             $rootScope.$state = $state;
             $rootScope.stateHolder = stateHolder;
@@ -2948,7 +2957,7 b' function kickstartAE(initialUserData) {'
     "                                    <span class=\"fa fa-bar-chart-o \"></span></a>\n" +
     "                                <ul class=\"dropdown-menu\">\n" +
     "                                    <li role=\"presentation\"><a data-ui-sref=\"front_dashboard\">Main dashboard</a></li>\n" +
-    "                                    <li role=\"presentation\" ng-repeat=\"item in $ctrl.AeConfig.topNav.menu_dashboards_items\">\n" +
+    "                                    <li role=\"presentation\" ng-repeat=\"item in $ctrl.AeConfig.topNav.menuDashboardsItems\">\n" +
     "                                        <a data-ui-sref=\"{{ item.sref }}\">{{ item.label }}</a>\n" +
     "                                    </li>\n" +
     "                                </ul>\n" +
@@ -2973,11 +2982,11 b' function kickstartAE(initialUserData) {'
     "                            <li>\n" +
     "                                <a data-ui-sref=\"user\" data-uib-tooltip=\"Settings\" tooltip-placement=\"bottom\"><span class=\"fa fa-cog \"></span></a>\n" +
     "                            </li>\n" +
-    "                            <li class=\"dropdown\" data-uib-dropdown data-ng-if=\"$ctrl.AeConfig.topNav.menu_admin_items.length\">\n" +
+    "                            <li class=\"dropdown\" data-uib-dropdown data-ng-if=\"$ctrl.AeConfig.topNav.menuAdminItems.length\">\n" +
     "                                <a class=\"dropdown-toggle\" data-uib-dropdown-toggle tooltip-placement=\"bottom\" data-uib-tooltip=\"Admin Settings\">\n" +
     "                                    <span class=\"fa fa-wrench\"></span></a>\n" +
     "                                <ul class=\"dropdown-menu\">\n" +
-    "                                    <li role=\"presentation\" ng-repeat=\"item in $ctrl.AeConfig.topNav.menu_admin_items\">\n" +
+    "                                    <li role=\"presentation\" ng-repeat=\"item in $ctrl.AeConfig.topNav.menuAdminItems\">\n" +
     "                                        <a data-ui-sref=\"{{ item.sref }}\">{{ item.label }}</a>\n" +
     "                                    </li>\n" +
     "                                </ul>\n" +
@@ -6157,6 +6166,13 b' function kickstartAE(initialUserData) {'
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.update({resourceId:'new'})\"><span class=\"fa fa-plus-circle\"></span> Create application</a></li>\n" +
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.purge_logs\"><span class=\"fa fa-trash-o\"></span> Purge logs</a></li>\n" +
     "            </ul>\n" +
+    "\n" +
+    "            <ul class=\"list-group\" data-ng-if=\"$ctrl.AeConfig.settingsNav.menuApplicationsItems.length\">\n" +
+    "                <li class=\"list-group-item\" ng-repeat=\"item in $ctrl.AeConfig.settingsNav.menuApplicationsItems\">\n" +
+    "                    <a data-ui-sref=\"{{ item.sref }}\">{{ item.label }}</a>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
+    "\n" +
     "        </div>\n" +
     "\n" +
     "\n" +
@@ -6168,6 +6184,13 b' function kickstartAE(initialUserData) {'
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.identities\"><span class=\"fa fa-link\"></span> External Identities</a></li>\n" +
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.auth_tokens\"><span class=\"fa fa-unlock\"></span> Auth Tokens</a></li>\n" +
     "            </ul>\n" +
+    "\n" +
+    "            <ul class=\"list-group\" data-ng-if=\"$ctrl.AeConfig.settingsNav.menuUserSettingsItems.length\">\n" +
+    "                <li class=\"list-group-item\" ng-repeat=\"item in $ctrl.AeConfig.settingsNav.menuUserSettingsItems\">\n" +
+    "                    <a data-ui-sref=\"{{ item.sref }}\">{{ item.label }}</a>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
+    "\n" +
     "        </div>\n" +
     "\n" +
     "        <div class=\"panel panel-default\">\n" +
@@ -6176,7 +6199,15 b' function kickstartAE(initialUserData) {'
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.list\"><span class=\"fa fa-bullhorn\"></span> Alert channels</a></li>\n" +
     "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.email\"><span class=\"fa fa-envelope\"></span> Add email channel</a></li>\n" +
     "            </ul>\n" +
+    "\n" +
+    "            <ul class=\"list-group\" data-ng-if=\"$ctrl.AeConfig.settingsNav.menuNotificationsItems.length\">\n" +
+    "                <li class=\"list-group-item\" ng-repeat=\"item in $ctrl.AeConfig.settingsNav.menuNotificationsItems\">\n" +
+    "                    <a data-ui-sref=\"{{ item.sref }}\">{{ item.label }}</a>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
+    "\n" +
     "        </div>\n" +
+    "\n" +
     "    </div>\n" +
     "\n" +
     "    <div class=\"col-sm-9\" ui-view></div>\n" +
@@ -10465,10 +10496,11 b" angular.module('appenlight.components.settingsView', [])"
         controller: SettingsViewController
     });
 
-SettingsViewController.$inject = ['$state'];
+SettingsViewController.$inject = ['$state', 'AeConfig'];
 
-function SettingsViewController($state) {
+function SettingsViewController($state, AeConfig) {
     this.$state = $state;
+    this.AeConfig = AeConfig;
     console.info('SettingsViewController');
 }
 
@@ -10921,7 +10953,19 b" aeconfig.factory('AeConfig', function () {"
     obj.flashMessages = decodeEncodedJSON(window.AE.flash_messages);
     obj.timeOptions = decodeEncodedJSON(window.AE.timeOptions);
     obj.plugins = decodeEncodedJSON(window.AE.plugins);
-    obj.topNav = decodeEncodedJSON(window.AE.topNav);
+    obj.topNav = {
+        menuDashboardsItems: [],
+        menuReportsItems: [],
+        menuLogsItems: [],
+        menuSettingsItems: [],
+        menuAdminItems: []
+    };
+    obj.settingsNav = {
+        menuApplicationsItems: [],
+        menuUserSettingsItems: [],
+        menuNotificationsItems: []
+    };
+    obj.adminNav = {};
     obj.ws_url = window.AE.ws_url;
     obj.urls = window.AE.urls;
     // set keys on values because we wont be able to retrieve them everywhere
@@ -13096,7 +13140,14 b" angular.module('appenlight.services.stateHolder', []).factory('stateHolder',"
                 self.inclusions[name] = [];
             }
             self.inclusions[name].push(inclusion);
-        }
+        },
+        addnavigation: function (name, inclusion) {
+            var self = this;
+            if (self.inclusions.hasOwnProperty(name) === false) {
+                self.inclusions[name] = [];
+            }
+            self.inclusions[name].push(inclusion);
+        },
     };
 
     var stateHolder = {

backend/src/appenlight/subscribers.py

@@ -38,8 +38,8 b' def gen_urls(request):'
         'applicationsNoId': request.route_url('applications_no_id'),
         'applications': request.route_url('applications', resource_id='REPLACE_ID').replace('REPLACE_ID',':resourceId'),
         'applicationsProperty': request.route_url('applications_property',key='REPLACE_KEY', resource_id='REPLACE_ID').replace('REPLACE_ID',':resourceId').replace('REPLACE_KEY',':key'),
-        'configsNoId':  request.route_url('admin_configs'),
-        'configs':  request.route_url('admin_config', key='REPLACE_KEY', section='REPLACE_SECTION').replace('REPLACE_SECTION',':section').replace('REPLACE_KEY',':key'),
+        'configsNoId': request.route_url('admin_configs'),
+        'configs': request.route_url('admin_config', key='REPLACE_KEY', section='REPLACE_SECTION').replace('REPLACE_SECTION',':section').replace('REPLACE_KEY',':key'),
         'docs': 'http://getappenlight.com/page/api/main.html',
         'eventsNoId': request.route_url('events_no_id'),
         'events': request.route_url('events', event_id='REPLACE_ID').replace('REPLACE_ID',':eventId'),
@@ -47,34 +47,34 b' def gen_urls(request):'
         'groupsNoId': request.route_url('groups_no_id'),
         'groups': request.route_url('groups', group_id='REPLACE_ID').replace('REPLACE_ID',':groupId'),
         'groupsProperty': request.route_url('groups_property',key='REPLACE_KEY', group_id='REPLACE_ID').replace('REPLACE_ID',':groupId').replace('REPLACE_KEY',':key'),
-        'logsNoId':  request.route_url('logs_no_id'),
+        'logsNoId': request.route_url('logs_no_id'),
         'integrationAction': request.route_url('integrations_id',action='REPLACE_ACT', resource_id='REPLACE_RID', integration='REPLACE_IID').replace('REPLACE_RID',':resourceId').replace('REPLACE_ACT',':action').replace('REPLACE_IID',':integration'),
         'usersNoId': request.route_url('users_no_id'),
         'users': request.route_url('users', user_id='REPLACE_ID').replace('REPLACE_ID',':userId'),
         'usersProperty': request.route_url('users_property',key='REPLACE_KEY', user_id='REPLACE_ID').replace('REPLACE_ID',':userId').replace('REPLACE_KEY',':key'),
         'userSelf': request.route_url('users_self'),
         'userSelfProperty': request.route_url('users_self_property',key='REPLACE_KEY').replace('REPLACE_KEY',':key'),
-        'reports':  request.route_url('reports'),
-        'reportGroup':  request.route_url('report_groups', group_id='REPLACE_RID').replace('REPLACE_RID',':groupId'),
-        'reportGroupProperty':  request.route_url('report_groups_property', key='REPLACE_KEY', group_id='REPLACE_GID').replace('REPLACE_KEY',':key').replace('REPLACE_GID',':groupId'),
-        'pluginConfigsNoId':  request.route_url('plugin_configs', plugin_name='REPLACE_TYPE').replace('REPLACE_TYPE',':plugin_name'),
-        'pluginConfigs':  request.route_url('plugin_config', id='REPLACE_ID', plugin_name='REPLACE_TYPE').replace('REPLACE_ID',':id').replace('REPLACE_TYPE',':plugin_name'),
+        'reports': request.route_url('reports'),
+        'reportGroup': request.route_url('report_groups', group_id='REPLACE_RID').replace('REPLACE_RID',':groupId'),
+        'reportGroupProperty': request.route_url('report_groups_property', key='REPLACE_KEY', group_id='REPLACE_GID').replace('REPLACE_KEY',':key').replace('REPLACE_GID',':groupId'),
+        'pluginConfigsNoId': request.route_url('plugin_configs', plugin_name='REPLACE_TYPE').replace('REPLACE_TYPE',':plugin_name'),
+        'pluginConfigs': request.route_url('plugin_config', id='REPLACE_ID', plugin_name='REPLACE_TYPE').replace('REPLACE_ID',':id').replace('REPLACE_TYPE',':plugin_name'),
         'resourceProperty': request.route_url('resources_property',key='REPLACE_KEY', resource_id='REPLACE_ID').replace('REPLACE_ID',':resourceId').replace('REPLACE_KEY',':key'),
-        'slowReports':  request.route_url('slow_reports'),
-        'sectionView':  request.route_url('section_view', section='REPLACE_S', view='REPLACE_V').replace('REPLACE_S',':section').replace('REPLACE_V',':view'),
+        'slowReports': request.route_url('slow_reports'),
+        'sectionView': request.route_url('section_view', section='REPLACE_S', view='REPLACE_V').replace('REPLACE_S',':section').replace('REPLACE_V',':view'),
         'otherRoutes': {
-            'register':  request.route_url('register') ,
-            'lostPassword':  request.route_url('lost_password') ,
-            'lostPasswordGenerate':  request.route_url('lost_password_generate'),
+            'register': request.route_url('register'),
+            'lostPassword': request.route_url('lost_password'),
+            'lostPasswordGenerate': request.route_url('lost_password_generate'),
             'signOut': request.route_url('ziggurat.routes.sign_out')
         },
         'social_auth': {
-            'google':request.route_url('social_auth', provider='google'),
-            'twitter':request.route_url('social_auth', provider='twitter'),
-            'bitbucket':request.route_url('social_auth', provider='bitbucket'),
-            'github':request.route_url('social_auth', provider='github'),
+            'google': request.route_url('social_auth', provider='google'),
+            'twitter': request.route_url('social_auth', provider='twitter'),
+            'bitbucket': request.route_url('social_auth', provider='bitbucket'),
+            'github': request.route_url('social_auth', provider='github'),
         },
-        "plugins":{},
+        "plugins": {},
         "adminAction": request.route_url('admin', action="REPLACE_ACT").replace('REPLACE_ACT',':action')
     }
     return urls
@@ -111,13 +111,6 b' def add_renderer_globals(event):'
     renderer_globals['security'] = security
     renderer_globals['flash_msgs'] = []
     renderer_globals['js_plugins'] = []
-    renderer_globals['top_nav'] = {
-        'menu_dashboards_items': [],
-        'menu_reports_items': [],
-        'menu_logs_items': [],
-        'menu_settings_items': [],
-        'menu_admin_items': [],
-    }
 
     if 'jinja' in event['renderer_info'].type:
         renderer_globals['url_list'] = gen_urls(request)
@@ -129,17 +122,7 b' def add_renderer_globals(event):'
 
             if config['javascript']:
                 renderer_globals['js_plugins'].append(
-                    ({'name':module, 'config':config['javascript']}))
-            for nav_key in renderer_globals['top_nav'].keys():
-                if nav_key in config['top_nav'] and config['top_nav'][nav_key]:
-                    renderer_globals['top_nav'][nav_key].append(
-                        config['top_nav'][nav_key])
-
-        if request.has_permission('root_administration',
-                                  security.RootFactory(request)):
-            renderer_globals['top_nav']['menu_admin_items'].append(
-                {'sref': 'admin', 'label': 'Admin Settings'}
-            )
+                    ({'name': module, 'config': config['javascript']}))
 
         footer_config = ConfigService.by_key_and_section(
             'template_footer_html', 'global', default_value='')

backend/src/appenlight/templates/layout_base.jinja2

@@ -27,7 +27,6 b''
         AE.flash_messages = {{ flash_msgs|toJSONUnsafe }};
         AE.timeOptions = {{ h.time_options|toJSONUnsafe }};
         AE.plugins = {{ js_plugins|toJSONUnsafe }};
-        AE.topNav = {{ top_nav|toJSONUnsafe }};
     </script>
     {% if request.registry.settings.get('appenlight.public_api_key') %}
         <script type="application/javascript">

frontend/src/app.js

@@ -108,7 +108,8 b' var pluginsToLoad = _.map(decodeEncodedJSON(window.AE.plugins),'
     function(item){
         return item.config.angular_module
     });
-console.log(pluginsToLoad);
+console.info(pluginsToLoad);
+
 angular.module('appenlight.plugins', pluginsToLoad);
 
 var app = angular.module('appenlight', [
@@ -179,6 +180,14 b' function kickstartAE(initialUserData) {'
         function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig) {
             if (initialUserData){
                 stateHolder.AeUser.update(initialUserData);
+
+                if (stateHolder.AeUser.hasAppPermission('root_administration'
+                )){
+                    AeConfig.topNav.menuAdminItems.push(
+                        {'sref': 'admin', 'label': 'Admin Settings'}
+                    )
+                }
+
             }
             $rootScope.$state = $state;
             $rootScope.stateHolder = stateHolder;

frontend/src/components/appenlight-header/appenlight-header.html

@@ -53,7 +53,7 b''
                                     <span class="fa fa-bar-chart-o "></span></a>
                                 <ul class="dropdown-menu">
                                     <li role="presentation"><a data-ui-sref="front_dashboard">Main dashboard</a></li>
-                                    <li role="presentation" ng-repeat="item in $ctrl.AeConfig.topNav.menu_dashboards_items">
+                                    <li role="presentation" ng-repeat="item in $ctrl.AeConfig.topNav.menuDashboardsItems">
                                         <a data-ui-sref="{{ item.sref }}">{{ item.label }}</a>
                                     </li>
                                 </ul>
@@ -78,11 +78,11 b''
                             <li>
                                 <a data-ui-sref="user" data-uib-tooltip="Settings" tooltip-placement="bottom"><span class="fa fa-cog "></span></a>
                             </li>
-                            <li class="dropdown" data-uib-dropdown data-ng-if="$ctrl.AeConfig.topNav.menu_admin_items.length">
+                            <li class="dropdown" data-uib-dropdown data-ng-if="$ctrl.AeConfig.topNav.menuAdminItems.length">
                                 <a class="dropdown-toggle" data-uib-dropdown-toggle tooltip-placement="bottom" data-uib-tooltip="Admin Settings">
                                     <span class="fa fa-wrench"></span></a>
                                 <ul class="dropdown-menu">
-                                    <li role="presentation" ng-repeat="item in $ctrl.AeConfig.topNav.menu_admin_items">
+                                    <li role="presentation" ng-repeat="item in $ctrl.AeConfig.topNav.menuAdminItems">
                                         <a data-ui-sref="{{ item.sref }}">{{ item.label }}</a>
                                     </li>
                                 </ul>

frontend/src/components/views/settings-view/settings-view.html

@@ -7,6 +7,13 b''
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="applications.update({resourceId:'new'})"><span class="fa fa-plus-circle"></span> Create application</a></li>
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="applications.purge_logs"><span class="fa fa-trash-o"></span> Purge logs</a></li>
             </ul>
+
+            <ul class="list-group" data-ng-if="$ctrl.AeConfig.settingsNav.menuApplicationsItems.length">
+                <li class="list-group-item" ng-repeat="item in $ctrl.AeConfig.settingsNav.menuApplicationsItems">
+                    <a data-ui-sref="{{ item.sref }}">{{ item.label }}</a>
+                </li>
+            </ul>
+
         </div>
 
 
@@ -18,6 +25,13 b''
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="user.profile.identities"><span class="fa fa-link"></span> External Identities</a></li>
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="user.profile.auth_tokens"><span class="fa fa-unlock"></span> Auth Tokens</a></li>
             </ul>
+
+            <ul class="list-group" data-ng-if="$ctrl.AeConfig.settingsNav.menuUserSettingsItems.length">
+                <li class="list-group-item" ng-repeat="item in $ctrl.AeConfig.settingsNav.menuUserSettingsItems">
+                    <a data-ui-sref="{{ item.sref }}">{{ item.label }}</a>
+                </li>
+            </ul>
+
         </div>
 
         <div class="panel panel-default">
@@ -26,7 +40,15 b''
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="user.alert_channels.list"><span class="fa fa-bullhorn"></span> Alert channels</a></li>
                 <li class="list-group-item" ui-sref-active-eq="active"><a data-ui-sref="user.alert_channels.email"><span class="fa fa-envelope"></span> Add email channel</a></li>
             </ul>
+
+            <ul class="list-group" data-ng-if="$ctrl.AeConfig.settingsNav.menuNotificationsItems.length">
+                <li class="list-group-item" ng-repeat="item in $ctrl.AeConfig.settingsNav.menuNotificationsItems">
+                    <a data-ui-sref="{{ item.sref }}">{{ item.label }}</a>
+                </li>
+            </ul>
+
         </div>
+
     </div>
 
     <div class="col-sm-9" ui-view></div>

frontend/src/components/views/settings-view/settings-view.js

@@ -23,9 +23,10 b" angular.module('appenlight.components.settingsView', [])"
         controller: SettingsViewController
     });
 
-SettingsViewController.$inject = ['$state'];
+SettingsViewController.$inject = ['$state', 'AeConfig'];
 
-function SettingsViewController($state) {
+function SettingsViewController($state, AeConfig) {
     this.$state = $state;
+    this.AeConfig = AeConfig;
     console.info('SettingsViewController');
 }

frontend/src/config.js

@@ -23,7 +23,19 b" aeconfig.factory('AeConfig', function () {"
     obj.flashMessages = decodeEncodedJSON(window.AE.flash_messages);
     obj.timeOptions = decodeEncodedJSON(window.AE.timeOptions);
     obj.plugins = decodeEncodedJSON(window.AE.plugins);
-    obj.topNav = decodeEncodedJSON(window.AE.topNav);
+    obj.topNav = {
+        menuDashboardsItems: [],
+        menuReportsItems: [],
+        menuLogsItems: [],
+        menuSettingsItems: [],
+        menuAdminItems: []
+    };
+    obj.settingsNav = {
+        menuApplicationsItems: [],
+        menuUserSettingsItems: [],
+        menuNotificationsItems: []
+    };
+    obj.adminNav = {};
     obj.ws_url = window.AE.ws_url;
     obj.urls = window.AE.urls;
     // set keys on values because we wont be able to retrieve them everywhere