Skip to content

Commit 9bc4696

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): d08915b806cd94bda01941e9589d2f98f39adc3d
1 parent 496d7eb commit 9bc4696

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed

pkg/assets/bindata.go

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5127,13 +5127,13 @@ title:c.pod
51275127
type:"warning",
51285128
message:"This terminal has been disconnected. If you reconnect, your terminal history will be lost."
51295129
}, a.noContainersYet = !0, a.selectedTab = {};
5130-
var k = [];
5130+
var k = [], l = null;
51315131
h.isAvailable().then(function(b) {
51325132
a.metricsAvailable = b;
51335133
});
5134-
var l = function(b) {
5134+
var m = function(b) {
51355135
a.logOptions.container = c.container || b.spec.containers[0].name, a.logCanRun = !_.includes([ "New", "Pending", "Unknown" ], b.status.phase);
5136-
}, m = function() {
5136+
}, n = function() {
51375137
if (a.pod) {
51385138
var b = _.find(a.pod.status.containerStatuses, {
51395139
name:a.logOptions.container
@@ -5150,7 +5150,7 @@ containerStartTime:_.get(c, [ d, "startedAt" ]),
51505150
containerEndTime:_.get(c, [ d, "finishedAt" ])
51515151
});
51525152
}
5153-
}, n = function() {
5153+
}, o = function() {
51545154
var a = $("<span>").css({
51555155
position:"absolute",
51565156
top:"-100px"
@@ -5159,31 +5159,31 @@ width:a.width() / 10,
51595159
height:a.height()
51605160
};
51615161
return a.remove(), b;
5162-
}, o = n(), p = $(window), q = function() {
5163-
o.height && o.width && a.$apply(function() {
5162+
}, p = o(), q = $(window), r = function() {
5163+
p.height && p.width && a.$apply(function() {
51645164
var b = $(".container-terminal-wrapper").get(0);
51655165
if (b) {
5166-
var c = b.getBoundingClientRect(), d = p.width(), e = p.height(), f = d - c.left - 40, g = e - c.top - 50;
5167-
a.terminalCols = Math.max(_.floor(f / o.width), 80), a.terminalRows = Math.max(_.floor(g / o.height), 24);
5166+
var c = b.getBoundingClientRect(), d = q.width(), e = q.height(), f = d - c.left - 40, g = e - c.top - 50;
5167+
a.terminalCols = Math.max(_.floor(f / p.width), 80), a.terminalRows = Math.max(_.floor(g / p.height), 24);
51685168
}
51695169
});
51705170
};
51715171
a.$watch("selectedTab.terminal", function(a) {
5172-
a ? (o.height && o.width ? $(window).on("resize.terminalsize", _.debounce(q, 100)) :Logger.warn("Unable to calculate the bounding box for a character. Terminal will not be able to resize."), d(q, 0)) :$(window).off("resize.terminalsize");
5172+
a ? (p.height && p.width ? $(window).on("resize.terminalsize", _.debounce(r, 100)) :Logger.warn("Unable to calculate the bounding box for a character. Terminal will not be able to resize."), d(r, 0)) :$(window).off("resize.terminalsize");
51735173
}), a.onTerminalSelectChange = function(b) {
51745174
_.each(a.containerTerminals, function(a) {
51755175
a.isVisible = !1;
51765176
}), b.isVisible = !0, b.isUsed = !0, a.selectedTerminalContainer = b;
51775177
};
5178-
var r = function(a) {
5178+
var s = function(a) {
51795179
var b = _.get(a, "state", {});
51805180
return _.head(_.keys(b));
5181-
}, s = function() {
5181+
}, t = function() {
51825182
var b = [];
51835183
_.each(a.pod.spec.containers, function(c) {
51845184
var d = _.find(a.pod.status.containerStatuses, {
51855185
name:c.name
5186-
}), e = r(d);
5186+
}), e = s(d);
51875187
b.push({
51885188
containerName:c.name,
51895189
isVisible:!1,
@@ -5193,38 +5193,40 @@ containerState:e
51935193
});
51945194
var c = _.head(b);
51955195
return c.isVisible = !0, c.isUsed = !0, a.selectedTerminalContainer = c, b;
5196-
}, t = function(b) {
5197-
a.noContainersYet && (a.noContainersYet = 0 === a.containersRunning(b.status.containerStatuses));
51985196
}, u = function(b) {
5197+
a.noContainersYet && (a.noContainersYet = 0 === a.containersRunning(b.status.containerStatuses));
5198+
}, v = function(b) {
51995199
_.each(b, function(b) {
52005200
var c = _.find(a.pod.status.containerStatuses, {
52015201
name:b.containerName
5202-
}), d = r(c);
5202+
}), d = s(c);
52035203
b.containerState = d;
52045204
});
5205+
}, w = function(b, c) {
5206+
a.loaded = !0, a.pod = b, m(b), n(), "DELETED" === c && (a.alerts.deleted = {
5207+
type:"warning",
5208+
message:"This pod has been deleted."
5209+
});
52055210
};
52065211
j.get(c.project).then(_.spread(function(d, h) {
5207-
a.project = d, a.projectContext = h, f.get("pods", c.pod, h).then(function(b) {
5208-
a.loaded = !0, a.pod = b, l(b), m();
5212+
l = h, a.project = d, a.projectContext = h, f.get("pods", c.pod, h).then(function(b) {
5213+
w(b);
52095214
var d = {};
5210-
d[b.metadata.name] = b, g.fetchReferencedImageStreamImages(d, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, h), a.containerTerminals = s(), t(b), k.push(f.watchObject("pods", c.pod, h, function(b, c) {
5211-
"DELETED" === c && (a.alerts.deleted = {
5212-
type:"warning",
5213-
message:"This pod has been deleted."
5214-
}), a.pod = b, l(b), m(), u(a.containerTerminals), t(b);
5215+
d[b.metadata.name] = b, a.containerTerminals = t(), u(b), g.fetchReferencedImageStreamImages(d, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, l), k.push(f.watchObject("pods", c.pod, h, function(b, c) {
5216+
w(b, c), v(a.containerTerminals), u(b);
52155217
}));
52165218
}, function(c) {
52175219
a.loaded = !0, a.alerts.load = {
52185220
type:"error",
52195221
message:"The pod details could not be loaded.",
52205222
details:"Reason: " + b("getErrorDetails")(c)
52215223
};
5222-
}), a.$watch("logOptions.container", m), k.push(f.watch("imagestreams", h, function(b) {
5224+
}), a.$watch("logOptions.container", n), k.push(f.watch("imagestreams", h, function(b) {
52235225
a.imageStreams = b.by("metadata.name"), g.buildDockerRefMapForImageStreams(a.imageStreams, a.imageStreamImageRefByDockerReference), g.fetchReferencedImageStreamImages(a.pods, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, h), Logger.log("imagestreams (subscribe)", a.imageStreams);
52245226
})), k.push(f.watch("builds", h, function(b) {
52255227
a.builds = b.by("metadata.name"), Logger.log("builds (subscribe)", a.builds);
52265228
}));
5227-
var j, n = function() {
5229+
var j, m = function() {
52285230
var c = a.debugPod;
52295231
j && (f.unwatch(j), j = null), $(window).off("beforeunload.debugPod"), c && (f["delete"]("pods", c.metadata.name, h, {
52305232
gracePeriodSeconds:0
@@ -5262,7 +5264,7 @@ return _.get(a, [ "imagesByDockerReference", g.image ]);
52625264
},
52635265
backdrop:"static"
52645266
});
5265-
i.result.then(n);
5267+
i.result.then(m);
52665268
}, function(d) {
52675269
a.alerts["debug-container-error"] = {
52685270
type:"error",
@@ -5279,7 +5281,7 @@ return a && a.forEach(function(a) {
52795281
a.state && a.state.running && b++;
52805282
}), b;
52815283
}, a.$on("$destroy", function() {
5282-
f.unwatchAll(k), n(), $(window).off("resize.terminalsize");
5284+
f.unwatchAll(k), m(), $(window).off("resize.terminalsize");
52835285
});
52845286
}));
52855287
} ]), angular.module("openshiftConsole").controller("OverviewController", [ "$filter", "$routeParams", "$scope", "AlertMessageService", "BuildsService", "DataService", "DeploymentsService", "LabelsService", "Logger", "PodsService", "ProjectsService", "RoutesService", "ServicesService", "Navigate", "MetricsService", "QuotaService", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {

0 commit comments

Comments
 (0)