From f70bd6d1184e5e5af8e44c733b37e92c7ae391ed Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@ansible.com>
Date: Mon, 4 Apr 2016 12:43:47 -0400
Subject: [PATCH] add breadcrumb, fix up main-menu ng-class statements to use
 $state.current instead of $location strings, #939 #940

---
 .../src/main-menu/main-menu.directive.js      | 28 ++--------------
 .../src/main-menu/main-menu.partial.html      | 32 +++++++++----------
 .../portal-mode-jobs.controller.js            |  5 +--
 .../src/portal-mode/portal-mode.route.js      |  4 ++-
 4 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/awx/ui/client/src/main-menu/main-menu.directive.js b/awx/ui/client/src/main-menu/main-menu.directive.js
index 80acd52a0a..50b4404648 100644
--- a/awx/ui/client/src/main-menu/main-menu.directive.js
+++ b/awx/ui/client/src/main-menu/main-menu.directive.js
@@ -1,36 +1,14 @@
 /* jshint unused: vars */
 
 export default
-    [   '$location', 'templateUrl', '$rootScope', function($location, templateUrl, $rootScope) {
+    [   '$state', 'templateUrl', '$rootScope', function($state, templateUrl, $rootScope) {
         return {
             restrict: 'E',
             templateUrl: templateUrl('main-menu/main-menu'),
             link: function(scope, element, attrs) {
-                // check to see if this is the current route
-                scope.isCurrentRoute = function(route) {
-                    if ($location.url().split('/')[1] === route) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                };
 
-                // check to see if the current route is the currently
-                // logged in user
-                scope.isCurrentRouteUser = function() {
-                    if ($rootScope && $rootScope.current_user) {
-                        if ($location.url().split('/')[1] === 'users') {
-                            if ($location.url().split('/')[2] === ($rootScope.current_user.id + "")) {
-                                    return true;
-                                } else {
-                                    return false;
-                                }
-                        } else {
-                            return false;
-                        }
-                    } else {
-                        return false;
-                    }
+                scope.isCurrentState = function(name){
+                    return $state.current.name == name
                 };
 
                 // set up the user tooltip
diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index 69d638792b..f05ab5b1ab 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -13,7 +13,7 @@
         <a class="MainMenu-item"
             id="main_menu_projects_mobile_link"
             href="/#/projects"
-            ng-class="{'is-currentRoute' : isCurrentRoute('projects')}">
+            ng-class="{'is-currentRoute' : isCurrentState('projects')}">
             <span class="MainMenu-itemText">
                 PROJECTS
             </span>
@@ -21,7 +21,7 @@
         <a class="MainMenu-item"
             id="main_menu_inventories_mobile_link"
             href="/#/inventories"
-            ng-class="{'is-currentRoute' : isCurrentRoute('inventories')}">
+            ng-class="{'is-currentRoute' : isCurrentState('inventories')}">
             <span class="MainMenu-itemText">
                 INVENTORIES
             </span>
@@ -29,7 +29,7 @@
         <a class="MainMenu-item"
             id="main_menu_job_templates_mobile_link"
             href="/#/job_templates"
-            ng-class="{'is-currentRoute' : isCurrentRoute('job_templates')}">
+            ng-class="{'is-currentRoute' : isCurrentState('jobTemplates')}">
             <span class="MainMenu-itemText">
                 JOB TEMPLATES
             </span>
@@ -37,7 +37,7 @@
         <a class="MainMenu-item"
             id="main_menu_jobs_mobile_link"
             href="/#/jobs"
-            ng-class="{'is-currentRoute' : isCurrentRoute('jobs')}">
+            ng-class="{'is-currentRoute' : isCurrentState('jobs')}">
             <span class="MainMenu-itemText">
                 JOBS
             </span>
@@ -45,7 +45,7 @@
         <a class="MainMenu-item"
             id="main_menu_current_user_mobile_link"
             ng-href="/#/users/{{ $root.current_user.id }}"
-            ng-class="{'is-currentRoute' : isCurrentRouteUser()}">
+            ng-class="{'is-currentRoute' : isCurrentState('users.edit')}">
             <span class="MainMenu-itemText">
                 VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}
             </span>
@@ -53,7 +53,7 @@
         <a class="MainMenu-item"
             id="main_menu_setup_mobile_link"
             ng-href="/#/setup"
-            ng-class="{'is-currentRoute' : isCurrentRoute('setup')}">
+            ng-class="{'is-currentRoute' : isCurrentState('setup')}">
             <span class="MainMenu-itemText">
                 SETTINGS
             </span>
@@ -61,7 +61,7 @@
         <a class="MainMenu-item"
             id="main_menu_setup_mobile_link"
             ui-sref="portalMode"
-            ng-class="{'is-currentRoute' : isCurrentRoute('portalMode')}">
+            ng-class="{'is-currentRoute' : isCurrentState('portalMode')}">
             <span class="MainMenu-itemText">
                 PORTAL MODE
             </span>
@@ -77,7 +77,7 @@
         <a class="MainMenu-item"
             id="main_menu_logout_mobile_link"
             ng-href="/#/logout"
-            ng-class="{'is-currentRoute' : isCurrentRoute('logout')}">
+            ng-class="{'is-currentRoute' : isCurrentState('logout')}">
             <span class="MainMenu-itemText">
                 LOG OUT
             </span>
@@ -88,7 +88,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         id="main_menu_projects_link"
         href="/#/projects"
-        ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}">
+        ng-class="{'is-currentRoute' : isCurrentState('projects'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             PROJECTS
         </span>
@@ -96,7 +96,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         id="main_menu_inventories_link"
         href="/#/inventories"
-        ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}">
+        ng-class="{'is-currentRoute' : isCurrentState('inventories'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             INVENTORIES
         </span>
@@ -104,7 +104,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         id="main_menu_job_templates_link"
         href="/#/job_templates"
-        ng-class="{'is-currentRoute' : isCurrentRoute('job_templates'), 'is-loggedOut' : !$root.current_user.username}">
+        ng-class="{'is-currentRoute' : isCurrentState('jobTemplates'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             JOB TEMPLATES
         </span>
@@ -112,7 +112,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left MainMenu-item--lastLeft"
         id="main_menu_jobs_link"
         href="/#/jobs"
-        ng-class="{'is-currentRoute' : isCurrentRoute('jobs'), 'is-loggedOut' : !$root.current_user.username}">
+        ng-class="{'is-currentRoute' : isCurrentState('jobs'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             JOBS
         </span>
@@ -120,7 +120,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--user MainMenu-item--right"
         id="main_menu_current_user_link"
         ng-href="/#/users/{{ $root.current_user.id }}"
-        ng-class="{'is-currentRoute' : isCurrentRouteUser(), 'is-loggedOut' : !$root.current_user.username}"
+        ng-class="{'is-currentRoute' : isCurrentState('users.edit'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="{{currentUserTip}}"
         aw-tip-watch="currentUserTip"
         data-placement="bottom"
@@ -136,7 +136,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
         id="main_menu_setup_link"
         ng-href="/#/setup"
-        ng-class="{'is-currentRoute' : isCurrentRoute('setup'), 'is-loggedOut' : !$root.current_user.username}"
+        ng-class="{'is-currentRoute' : isCurrentState('setup'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="Settings"
         data-placement="bottom"
         data-trigger="hover"
@@ -148,7 +148,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
         id="main_menu_portal_link"
         ng-href="/#/portal"
-        ng-class="{'is-currentRoute' : isCurrentRoute('portalMode'), 'is-loggedOut' : !$root.current_user.username}"
+        ng-class="{'is-currentRoute' : isCurrentState('portalMode'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="Portal Mode"
         data-placement="bottom"
         data-trigger="hover"
@@ -173,7 +173,7 @@
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
         id="main_menu_logout_link"
         ng-href="/#/logout"
-        ng-class="{'is-currentRoute' : isCurrentRoute('logout'), 'is-loggedOut' : !$root.current_user.username}"
+        ng-class="{'is-currentRoute' : isCurrentState('logout'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="Log Out"
         data-placement="bottom"
         data-trigger="hover"
diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
index aa1f499c25..74fff32954 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
+++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
@@ -4,8 +4,9 @@
  * All Rights Reserved
  *************************************************/
 
-export function PortalModeJobsController($scope, $rootScope, GetBasePath, GenerateList, PortalJobsList, SearchInit,
+export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath, GenerateList, PortalJobsList, SearchInit,
 	PaginateInit){
+
 	var list = PortalJobsList,
 	view = GenerateList,
 	// show user jobs by default
@@ -55,5 +56,5 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera
 	init();
 }
 
-PortalModeJobsController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',
+PortalModeJobsController.$inject = ['$scope', '$state', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',
 	'PaginateInit']
\ No newline at end of file
diff --git a/awx/ui/client/src/portal-mode/portal-mode.route.js b/awx/ui/client/src/portal-mode/portal-mode.route.js
index 31df115b6d..f738e3c615 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.route.js
+++ b/awx/ui/client/src/portal-mode/portal-mode.route.js
@@ -5,9 +5,11 @@ import {PortalModeJobsController} from './portal-mode-jobs.controller';
 // Using multiple named views requires a parent layout
 // https://github.com/angular-ui/ui-router/wiki/Multiple-Named-Views
 export default {
-    abstract: true,
 	name: 'portalMode',
     url: '/portal',
+    ncyBreadcrumb: {
+        label: "PORTAL MODE"
+    },
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();