...
|
...
|
@@ -12873,7 +12873,6 @@ transclude:!0,
|
12873
|
12873
|
templateUrl:"views/directives/logs/_log-viewer.html",
|
12874
|
12874
|
scope:{
|
12875
|
12875
|
followAffixTop:"=?",
|
12876
|
|
-followAffixBottom:"=?",
|
12877
|
12876
|
object:"=",
|
12878
|
12877
|
fullLogUrl:"=?",
|
12879
|
12878
|
name:"=",
|
...
|
...
|
@@ -12906,21 +12905,19 @@ p.off("scroll", y), m.off("scroll", y), window.innerWidth <= l.screenSmMin && !i
|
12906
|
12906
|
i.fixedHeight || (window.innerWidth < l.screenSmMin && !i.fixedHeight ? r.removeClass("target-logger-node").affix({
|
12907
|
12907
|
target:window,
|
12908
|
12908
|
offset:{
|
12909
|
|
-top:i.followAffixTop || 0,
|
12910
|
|
-bottom:i.followAffixBottom || 0
|
|
12909
|
+top:i.followAffixTop || 0
|
12911
|
12910
|
}
|
12912
|
12911
|
}) :r.addClass("target-logger-node").affix({
|
12913
|
12912
|
target:p,
|
12914
|
12913
|
offset:{
|
12915
|
|
-top:i.followAffixTop || 0,
|
12916
|
|
-bottom:i.followAffixBottom || 0
|
|
12914
|
+top:i.followAffixTop || 0
|
12917
|
12915
|
}
|
12918
|
12916
|
}));
|
12919
|
12917
|
}, B = function(a) {
|
12920
|
12918
|
var b = $("#" + i.logViewerID + " .log-view-output"), c = b.offset().top;
|
12921
|
12919
|
if (!(c < 0)) {
|
12922
|
12920
|
var d = $(".ellipsis-pulser").outerHeight(!0), e = i.fixedHeight ? i.fixedHeight :Math.floor($(window).height() - c - d);
|
12923
|
|
-i.chromeless || i.fixedHeight || (e -= 35), a ? b.animate({
|
|
12921
|
+i.chromeless || i.fixedHeight || (e -= 40), a ? b.animate({
|
12924
|
12922
|
"min-height":e + "px"
|
12925
|
12923
|
}, "fast") :b.css("min-height", e + "px"), i.fixedHeight && b.css("max-height", e);
|
12926
|
12924
|
}
|
...
|
...
|
@@ -12942,7 +12939,7 @@ D && (D.stop(), D = null), a || (H.cancel(), j && (j.innerHTML = ""), G = docume
|
12942
|
12942
|
if (I(), i.run) {
|
12943
|
12943
|
angular.extend(i, {
|
12944
|
12944
|
loading:!0,
|
12945
|
|
-autoScroll:!1,
|
|
12945
|
+autoScrollActive:!0,
|
12946
|
12946
|
limitReached:!1,
|
12947
|
12947
|
showScrollLinks:!1
|
12948
|
12948
|
});
|
...
|
...
|
@@ -12973,7 +12970,7 @@ i.loading = !1;
|
12973
|
12973
|
D = null, i.$evalAsync(function() {
|
12974
|
12974
|
angular.extend(i, {
|
12975
|
12975
|
loading:!1,
|
12976
|
|
-autoScroll:!1
|
|
12976
|
+autoScrollActive:!1
|
12977
|
12977
|
}), 0 === c ? (i.state = "empty", i.emptyStateMessage = "The logs are no longer available or could not be loaded.") :i.errorWhileRunning = !0;
|
12978
|
12978
|
});
|
12979
|
12979
|
}), D.start();
|
...
|
...
|
@@ -13006,7 +13003,7 @@ v(), z(), A();
|
13006
|
13006
|
}, angular.extend(i, {
|
13007
|
13007
|
ready:!0,
|
13008
|
13008
|
loading:!0,
|
13009
|
|
-autoScroll:!1,
|
|
13009
|
+autoScrollActive:!0,
|
13010
|
13010
|
state:!1,
|
13011
|
13011
|
onScrollBottom:function() {
|
13012
|
13012
|
k.scrollBottom(q);
|
...
|
...
|
@@ -18188,7 +18185,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
18188
|
18188
|
"</uib-tab>\n" +
|
18189
|
18189
|
"<uib-tab active=\"selectedTab.logs\" ng-if=\"!(build | isJenkinsPipelineStrategy) && ('builds/log' | canI : 'get')\">\n" +
|
18190
|
18190
|
"<uib-tab-heading>Logs</uib-tab-heading>\n" +
|
18191
|
|
- "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" object=\"build\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
|
18191
|
+ "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" object=\"build\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
18192
|
18192
|
"<label>Status:</label>\n" +
|
18193
|
18193
|
"<status-icon status=\"build.status.phase\"></status-icon>\n" +
|
18194
|
18194
|
"<span class=\"space-after\">{{build.status.phase}}</span>\n" +
|
...
|
...
|
@@ -19249,7 +19246,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
19249
|
19249
|
"</uib-tab>\n" +
|
19250
|
19250
|
"<uib-tab active=\"selectedTab.logs\" ng-if=\"'pods/log' | canI : 'get'\">\n" +
|
19251
|
19251
|
"<uib-tab-heading>Logs</uib-tab-heading>\n" +
|
19252
|
|
- "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" object=\"pod\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
|
19252
|
+ "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" object=\"pod\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
19253
|
19253
|
"<span class=\"container-details\">\n" +
|
19254
|
19254
|
"<label for=\"selectLogContainer\">Container:</label>\n" +
|
19255
|
19255
|
"<span ng-if=\"pod.spec.containers.length === 1\">\n" +
|
...
|
...
|
@@ -19419,7 +19416,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
19419
|
19419
|
"</uib-tab>\n" +
|
19420
|
19420
|
"<uib-tab ng-if=\"deploymentConfigName && logOptions.version && ('deploymentconfigs/log' | canI : 'get')\" active=\"selectedTab.logs\">\n" +
|
19421
|
19421
|
"<uib-tab-heading>Logs</uib-tab-heading>\n" +
|
19422
|
|
- "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" object=\"replicaSet\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
|
19422
|
+ "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" object=\"replicaSet\" context=\"projectContext\" options=\"logOptions\" empty=\"logEmpty\" run=\"logCanRun\">\n" +
|
19423
|
19423
|
"<span ng-if=\"replicaSet | deploymentStatus\">\n" +
|
19424
|
19424
|
"<label>Status:</label>\n" +
|
19425
|
19425
|
"<status-icon status=\"replicaSet | deploymentStatus\"></status-icon>\n" +
|
...
|
...
|
@@ -23076,13 +23073,13 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
23076
|
23076
|
"</div>\n" +
|
23077
|
23077
|
"\n" +
|
23078
|
23078
|
"<div ng-show=\"state=='logs'\">\n" +
|
23079
|
|
- "<div class=\"log-view\" id=\"{{logViewerID}}\" ng-class=\"{'log-fixed-height': fixedHeight}\">\n" +
|
23080
|
|
- "<div ng-show=\"showScrollLinks\" id=\"{{logViewerID}}-affixedFollow\" class=\"log-scroll log-scroll-top\">\n" +
|
|
23079
|
+ "<div class=\"log-view\" ng-attr-id=\"{{logViewerID}}\" ng-class=\"{'log-fixed-height': fixedHeight}\">\n" +
|
|
23080
|
+ "<div id=\"{{logViewerID}}-affixedFollow\" class=\"log-scroll log-scroll-top\">\n" +
|
23081
|
23081
|
"<a ng-if=\"loading\" href=\"\" ng-click=\"toggleAutoScroll()\">\n" +
|
23082
|
23082
|
"<span ng-if=\"!autoScrollActive\">Follow</span>\n" +
|
23083
|
|
- "<span ng-if=\"autoScrollActive\">Stop following</span>\n" +
|
|
23083
|
+ "<span ng-if=\"autoScrollActive\">Stop Following</span>\n" +
|
23084
|
23084
|
"</a>\n" +
|
23085
|
|
- "<a ng-if=\"!loading\" href=\"\" ng-click=\"onScrollBottom()\">\n" +
|
|
23085
|
+ "<a ng-if=\"!loading\" href=\"\" ng-show=\"showScrollLinks\" ng-click=\"onScrollBottom()\">\n" +
|
23086
|
23086
|
"Go to End\n" +
|
23087
|
23087
|
"</a>\n" +
|
23088
|
23088
|
"</div>\n" +
|