@@ -5127,13 +5127,13 @@ title:c.pod
5127
5127
type:"warning",
5128
5128
message:"This terminal has been disconnected. If you reconnect, your terminal history will be lost."
5129
5129
}, a.noContainersYet = !0, a.selectedTab = {};
5130
- var k = [];
5130
+ var k = [], l = null ;
5131
5131
h.isAvailable().then(function(b) {
5132
5132
a.metricsAvailable = b;
5133
5133
});
5134
- var l = function(b) {
5134
+ var m = function(b) {
5135
5135
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() {
5137
5137
if (a.pod) {
5138
5138
var b = _.find(a.pod.status.containerStatuses, {
5139
5139
name:a.logOptions.container
@@ -5150,7 +5150,7 @@ containerStartTime:_.get(c, [ d, "startedAt" ]),
5150
5150
containerEndTime:_.get(c, [ d, "finishedAt" ])
5151
5151
});
5152
5152
}
5153
- }, n = function() {
5153
+ }, o = function() {
5154
5154
var a = $("<span>").css({
5155
5155
position:"absolute",
5156
5156
top:"-100px"
@@ -5159,31 +5159,31 @@ width:a.width() / 10,
5159
5159
height:a.height()
5160
5160
};
5161
5161
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() {
5164
5164
var b = $(".container-terminal-wrapper").get(0);
5165
5165
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);
5168
5168
}
5169
5169
});
5170
5170
};
5171
5171
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");
5173
5173
}), a.onTerminalSelectChange = function(b) {
5174
5174
_.each(a.containerTerminals, function(a) {
5175
5175
a.isVisible = !1;
5176
5176
}), b.isVisible = !0, b.isUsed = !0, a.selectedTerminalContainer = b;
5177
5177
};
5178
- var r = function(a) {
5178
+ var s = function(a) {
5179
5179
var b = _.get(a, "state", {});
5180
5180
return _.head(_.keys(b));
5181
- }, s = function() {
5181
+ }, t = function() {
5182
5182
var b = [];
5183
5183
_.each(a.pod.spec.containers, function(c) {
5184
5184
var d = _.find(a.pod.status.containerStatuses, {
5185
5185
name:c.name
5186
- }), e = r (d);
5186
+ }), e = s (d);
5187
5187
b.push({
5188
5188
containerName:c.name,
5189
5189
isVisible:!1,
@@ -5193,38 +5193,40 @@ containerState:e
5193
5193
});
5194
5194
var c = _.head(b);
5195
5195
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));
5198
5196
}, u = function(b) {
5197
+ a.noContainersYet && (a.noContainersYet = 0 === a.containersRunning(b.status.containerStatuses));
5198
+ }, v = function(b) {
5199
5199
_.each(b, function(b) {
5200
5200
var c = _.find(a.pod.status.containerStatuses, {
5201
5201
name:b.containerName
5202
- }), d = r (c);
5202
+ }), d = s (c);
5203
5203
b.containerState = d;
5204
5204
});
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
+ });
5205
5210
};
5206
5211
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 );
5209
5214
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);
5215
5217
}));
5216
5218
}, function(c) {
5217
5219
a.loaded = !0, a.alerts.load = {
5218
5220
type:"error",
5219
5221
message:"The pod details could not be loaded.",
5220
5222
details:"Reason: " + b("getErrorDetails")(c)
5221
5223
};
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) {
5223
5225
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);
5224
5226
})), k.push(f.watch("builds", h, function(b) {
5225
5227
a.builds = b.by("metadata.name"), Logger.log("builds (subscribe)", a.builds);
5226
5228
}));
5227
- var j, n = function() {
5229
+ var j, m = function() {
5228
5230
var c = a.debugPod;
5229
5231
j && (f.unwatch(j), j = null), $(window).off("beforeunload.debugPod"), c && (f["delete"]("pods", c.metadata.name, h, {
5230
5232
gracePeriodSeconds:0
@@ -5262,7 +5264,7 @@ return _.get(a, [ "imagesByDockerReference", g.image ]);
5262
5264
},
5263
5265
backdrop:"static"
5264
5266
});
5265
- i.result.then(n );
5267
+ i.result.then(m );
5266
5268
}, function(d) {
5267
5269
a.alerts["debug-container-error"] = {
5268
5270
type:"error",
@@ -5279,7 +5281,7 @@ return a && a.forEach(function(a) {
5279
5281
a.state && a.state.running && b++;
5280
5282
}), b;
5281
5283
}, a.$on("$destroy", function() {
5282
- f.unwatchAll(k), n (), $(window).off("resize.terminalsize");
5284
+ f.unwatchAll(k), m (), $(window).off("resize.terminalsize");
5283
5285
});
5284
5286
}));
5285
5287
} ]), 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