Merge remote-tracking branch 'upstream/master'

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs

@@ -74,6 +74,11 @@
             </ul>
         </li>
     {{/if}}
+    {{#if permissions.VIEW_DASHBOARD}}
+        <li><a href="{{serverURL}}/portal/dashboards/emm-analytics-dashboard/">
+            <i class="fw fw-pie-chart"></i>Device Management Dashboard</a>
+        </li>
+    {{/if}}
 {{/zone}}
 
 {{#zone "navbarCollapsableRightItems"}}

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js

@@ -55,9 +55,11 @@ function onRequest(context) {
     permissions["LIST_CERTIFICATES"] = userModule.isAuthorized("/permission/admin/device-mgt/certificates/view");
     permissions["CONFIG_MGT_PERMITTED"] = (permissions["LIST_PLATFORM_CONFIGURATIONS"] || permissions["LIST_CERTIFICATES"]);
     permissions["LIST_NOTIFICATIONS"] = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
+    permissions["VIEW_DASHBOARD"] = userModule.isAuthorized("/permission/admin/device-mgt/dashboard/view");
 
     viewModel["permissions"] = permissions;
     viewModel["appContext"] = mdmProps["appContext"];
+    viewModel["serverURL"] = mdmProps["httpsWebURL"];
 
     return viewModel;
 }