Skip to content

Commit c42e52b

Browse files
committed
DO NOT MERGE - Debugging test flake
1 parent 0200cf1 commit c42e52b

File tree

4 files changed

+30
-11
lines changed

4 files changed

+30
-11
lines changed

app/scripts/directives/nav.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ angular.module('openshiftConsole')
305305
});
306306
};
307307

308-
$scope.$on('$routeChangeSuccess', function() {
308+
$scope.$on('$routeChangeSuccess', function(event, next) {
309+
$scope.nextRoute = next;
309310
var currentProjectName = $routeParams.project;
310311
if ($scope.currentProjectName === currentProjectName) {
311312
// The project hasn't changed.

app/views/directives/header/header.html

+13-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@
66
<span class="icon-bar"></span>
77
<span class="icon-bar"></span>
88
</button>
9+
<!-- DEBUGGING -- DO NOT MERGE -->
910
<!-- JS click handler for #openshift-logo -->
10-
<a class="navbar-brand" id="openshift-logo" href="./">
11-
<div id="header-logo"></div>
12-
</a>
11+
<!-- <a class="navbar-brand" id="openshift-logo" href="./"> -->
12+
<!-- <div id="header-logo"></div> -->
13+
<!-- </a> -->
14+
<div style="color: white;">
15+
view.hasProject: {{view.hasProject}}
16+
currentProjectName: {{currentProjectName}}
17+
projectName: {{projectName}}
18+
currentProject set: {{!!currentProject}}
19+
</div>
20+
<div style="color: white;">
21+
nextRoute: {{nextRoute.params}}
22+
</div>
1323
</div>
1424
<navbar-utility></navbar-utility>
1525
</nav>

dist/scripts/scripts.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -10137,10 +10137,11 @@ return s.list().then(function(e) {
1013710137
l = e.by("metadata.name");
1013810138
});
1013910139
};
10140-
r.$on("$routeChangeSuccess", function() {
10141-
var e = a.project;
10142-
r.currentProjectName !== e && (r.currentProjectName = e, r.chromeless = "chromeless" === a.view, e && !r.chromeless ? (_.set(n, "view.hasProject", !0), r.canIAddToProject = !1, o.getProjectRules(e).then(function() {
10143-
r.currentProjectName === e && (r.canIAddToProject = o.canIAddToProject(e));
10140+
r.$on("$routeChangeSuccess", function(e, t) {
10141+
r.nextRoute = t;
10142+
var i = a.project;
10143+
r.currentProjectName !== i && (r.currentProjectName = i, r.chromeless = "chromeless" === a.view, i && !r.chromeless ? (_.set(n, "view.hasProject", !0), r.canIAddToProject = !1, o.getProjectRules(i).then(function() {
10144+
r.currentProjectName === i && (r.canIAddToProject = o.canIAddToProject(i));
1014410145
}), C().then(function() {
1014510146
r.currentProjectName && l && (l[r.currentProjectName] || (l[r.currentProjectName] = {
1014610147
metadata: {

dist/scripts/templates.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -6927,9 +6927,16 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
69276927
"<span class=\"icon-bar\"></span>\n" +
69286928
"</button>\n" +
69296929
"\n" +
6930-
"<a class=\"navbar-brand\" id=\"openshift-logo\" href=\"./\">\n" +
6931-
"<div id=\"header-logo\"></div>\n" +
6932-
"</a>\n" +
6930+
"\n" +
6931+
"\n" +
6932+
"\n" +
6933+
"\n" +
6934+
"<div style=\"color: white\">\n" +
6935+
"view.hasProject: {{view.hasProject}} currentProjectName: {{currentProjectName}} projectName: {{projectName}} currentProject set: {{!!currentProject}}\n" +
6936+
"</div>\n" +
6937+
"<div style=\"color: white\">\n" +
6938+
"nextRoute: {{nextRoute.params}}\n" +
6939+
"</div>\n" +
69336940
"</div>\n" +
69346941
"<navbar-utility></navbar-utility>\n" +
69356942
"</nav>\n" +

0 commit comments

Comments
 (0)