Skip to content

Commit

Permalink
bump(github.com/openshift/origin-web-console): ed51404a3febc8c3b6bce6…
Browse files Browse the repository at this point in the history 
…16933cd6003fb0ea8d
  • Loading branch information
OpenShift Bot committed Jun 16, 2017
1 parent 6dcc0a4 commit ee15d99
Showing 1 changed file with 73 additions and 56 deletions.
129 changes: 73 additions & 56 deletions pkg/assets/bindata.go
View file
Expand Up @@ -6313,35 +6313,45 @@ link:"project/" + c.project + "/browse/builds/" + c.buildconfig
})), a.breadcrumbs.push({
title:c.build
});
var i = [], j = function(b) {
var i, j = b("annotation"), k = [], l = function(b) {
a.logCanRun = !_.includes([ "New", "Pending", "Error" ], b.status.phase);
}, k = function() {
}, m = function() {
a.buildConfig ? a.canBuild = d.canBuild(a.buildConfig) :a.canBuild = !1;
}, l = function(c, d) {
a.loaded = !0, a.build = c, j(c);
var e = b("annotation")(c, "buildNumber");
e && (a.breadcrumbs[2].title = "#" + e), "DELETED" === d && (a.alerts.deleted = {
};
h.get(c.project).then(_.spread(function(g, h) {
a.project = g, a.projectContext = h, a.logOptions = {};
var n = function() {
i ? a.eventObjects = [ a.build, i ] :a.eventObjects = [ a.build ];
}, o = function(b, c) {
a.loaded = !0, a.build = b, l(b), n();
var d = j(b, "buildNumber");
d && (a.breadcrumbs[2].title = "#" + d), "DELETED" === c && (a.alerts.deleted = {
type:"warning",
message:"This build has been deleted."
});
}, m = function(c) {
var f;
i || (f = j(b, "buildPod"), f && e.get("pods", f, h, {
errorNotification:!1
}).then(function(a) {
i = a, n();
}));
}, p = function(c) {
a.loaded = !0, a.alerts.load = {
type:"error",
message:"The build details could not be loaded.",
details:b("getErrorDetails")(c)
};
}, n = function(b, c) {
}, q = function(b, c) {
"DELETED" === c && (a.alerts.deleted = {
type:"warning",
message:"Build configuration " + a.buildConfigName + " has been deleted."
}, a.buildConfigDeleted = !0), a.buildConfig = b, a.buildConfigPaused = d.isPaused(a.buildConfig), k();
}, a.buildConfigDeleted = !0), a.buildConfig = b, a.buildConfigPaused = d.isPaused(a.buildConfig), m();
};
h.get(c.project).then(_.spread(function(b, g) {
a.project = b, a.projectContext = g, a.logOptions = {}, e.get("builds", c.build, g, {
e.get("builds", c.build, h, {
errorNotification:!1
}).then(function(a) {
l(a), i.push(e.watchObject("builds", c.build, g, l)), i.push(e.watchObject("buildconfigs", c.buildconfig, g, n));
}, m), a.toggleSecret = function() {
o(a), k.push(e.watchObject("builds", c.build, h, o)), k.push(e.watchObject("buildconfigs", c.buildconfig, h, q));
}, p), a.toggleSecret = function() {
a.showSecret = !0;
}, a.cancelBuild = function() {
d.cancelBuild(a.build, a.buildConfigName);
Expand All @@ -6350,7 +6360,7 @@ a.build && a.canBuild && d.cloneBuild(a.build, a.buildConfigName);
}, a.showJenkinsfileExamples = function() {
f.showJenkinsfileExamples();
}, a.$on("$destroy", function() {
e.unwatchAll(i);
e.unwatchAll(k);
});
}));
} ]), angular.module("openshiftConsole").controller("ImageController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", "ImageStreamsService", "imageLayers", function(a, b, c, d, e, f, g) {
Expand Down Expand Up @@ -10129,47 +10139,55 @@ c[a.key] = a.value;
return {
restrict:"E",
scope:{
resourceKind:"@?",
resourceName:"@?",
apiObjects:"=?",
projectContext:"="
},
templateUrl:"views/directives/events.html",
controller:[ "$scope", function(a) {
var b, e = {}, g = [];
a.filter = {
text:""
};
var b = function(b) {
return a.resourceKind ? _.filter(b, function(b) {
return b.involvedObject.kind === a.resourceKind && b.involvedObject.name === a.resourceName;
}) :b;
}, e = [], g = _.get(a, "sortConfig.currentField.id"), h = {
var h = function(a) {
return _.isEmpty(e) ? a :_.filter(a, function(a) {
return e[a.involvedObject.uid];
});
}, i = [], j = _.get(a, "sortConfig.currentField.id"), k = {
lastTimestamp:!0
}, i = function() {
}, l = function() {
var b = _.get(a, "sortConfig.currentField.id", "lastTimestamp");
g !== b && (g = b, a.sortConfig.isAscending = !h[g]);
j !== b && (j = b, a.sortConfig.isAscending = !k[j]);
var c = a.sortConfig.isAscending ? "asc" :"desc";
e = _.sortByOrder(a.events, [ b ], [ c ]);
}, j = [], k = function() {
a.filterExpressions = j = d.generateKeywords(_.get(a, "filter.text"));
}, l = [ "reason", "message", "type" ];
a.resourceKind && a.resourceName || l.splice(0, 0, "involvedObject.name", "involvedObject.kind");
var m = function() {
a.filteredEvents = d.filterForKeywords(e, l, j);
i = _.sortByOrder(a.events, [ b ], [ c ]);
}, m = [], n = function() {
a.filterExpressions = m = d.generateKeywords(_.get(a, "filter.text"));
}, o = [ "reason", "message", "type" ];
a.resourceKind && a.resourceName || o.splice(0, 0, "involvedObject.name", "involvedObject.kind");
var p = function() {
a.filteredEvents = d.filterForKeywords(i, o, m);
};
a.$watch("filter.text", _.debounce(function() {
k(), a.$apply(m);
n(), a.$evalAsync(p);
}, 50, {
maxWait:250
}));
var n = function() {
i(), m();
}, o = _.debounce(function() {
a.$evalAsync(n);
var q = function() {
l(), p();
}, r = _.debounce(function() {
b && a.$evalAsync(function() {
a.events = h(b), q();
});
}, 250, {
leading:!0,
trailing:!1,
trailing:!0,
maxWait:1e3
});
a.$watch("apiObjects", function(c) {
e = {}, _.each(c, function(a) {
var b = _.get(a, "metadata.uid");
b && (e[a.metadata.uid] = !0);
}), a.showKindAndName = 1 !== _.size(e), b && r();
}), a.$watch("showKindAndName", function(b) {
a.sortConfig = {
fields:[ {
id:"lastTimestamp",
Expand All @@ -10193,8 +10211,8 @@ title:"Count",
sortType:"numeric"
} ],
isAscending:!0,
onSortChange:n
}, a.resourceKind && a.resourceName || a.sortConfig.fields.splice(1, 0, {
onSortChange:q
}, b && a.sortConfig.fields.splice(1, 0, {
id:"involvedObject.name",
title:"Name",
sortType:"alpha"
Expand All @@ -10203,11 +10221,10 @@ id:"involvedObject.kind",
title:"Kind",
sortType:"alpha"
});
var p = [];
p.push(c.watch("events", a.projectContext, function(c) {
a.events = b(c.by("metadata.name")), o(), f.log("events (subscribe)", a.filteredEvents);
}), g.push(c.watch("events", a.projectContext, function(c) {
b = c.by("metadata.name"), r(), f.log("events (subscribe)", a.filteredEvents);
})), a.$on("$destroy", function() {
c.unwatchAll(p);
c.unwatchAll(g);
});
} ]
};
Expand Down Expand Up @@ -18301,7 +18318,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"('events' | canI : 'watch')\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"Pod\" resource-name=\"{{build | annotation : 'buildPod'}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"eventObjects\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -18765,7 +18782,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"DeploymentConfig\" resource-name=\"{{deploymentConfig.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ deploymentConfig ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -19001,7 +19018,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"Deployment\" resource-name=\"{{deployment.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ deployment ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -19205,7 +19222,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"PersistentVolumeClaim\" resource-name=\"{{pvc.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ pvc ] \" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -19367,7 +19384,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"Pod\" resource-name=\"{{pod.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ pod ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -19470,7 +19487,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"{{kind}}\" resource-name=\"{{replicaSet.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ replicaSet ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -19981,7 +19998,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</uib-tab>\n" +
"<uib-tab active=\"selectedTab.events\" ng-if=\"'events' | canI : 'watch'\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<events resource-kind=\"Service\" resource-name=\"{{service.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ service ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
"</div>\n" +
Expand Down Expand Up @@ -20110,7 +20127,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<uib-tab active=\"selectedTab.events\">\n" +
"<uib-tab-heading>Events</uib-tab-heading>\n" +
"<div class=\"resource-events\">\n" +
"<events resource-kind=\"StatefulSet\" resource-name=\"{{statefulSet.metadata.name}}\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"<events api-objects=\"[ statefulSet ]\" project-context=\"projectContext\" ng-if=\"selectedTab.events\"></events>\n" +
"</div>\n" +
"</uib-tab>\n" +
"</uib-tabset>\n" +
Expand Down Expand Up @@ -22966,11 +22983,11 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<tr>\n" +
"<th id=\"time\">Time</th>\n" +
"\n" +
"<th id=\"kind-name\" ng-if=\"!resourceKind || !resourceName\">\n" +
"<th id=\"kind-name\" ng-if=\"showKindAndName\">\n" +
"<span class=\"hidden-xs-inline visible-sm-inline visible-md-inline hidden-lg-inline\">Kind and Name</span>\n" +
"<span class=\"visible-lg-inline\">Name</span>\n" +
"</th>\n" +
"<th id=\"kind\" ng-if=\"!resourceKind || !resourceName\" class=\"hidden-sm hidden-md\">\n" +
"<th id=\"kind\" ng-if=\"showKindAndName\" class=\"hidden-sm hidden-md\">\n" +
"<span class=\"visible-lg-inline\">Kind</span>\n" +
"</th>\n" +
"<th id=\"severity\" class=\"hidden-xs hidden-sm hidden-md\"><span class=\"sr-only\">Severity</span></th>\n" +
Expand All @@ -22980,14 +22997,14 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</thead>\n" +
"<tbody ng-if=\"(filteredEvents | hashSize) === 0\">\n" +
"<tr>\n" +
"<td class=\"hidden-lg\" colspan=\"{{!resourceKind || !resourceName ? 3 : 2}}\">\n" +
"<td class=\"hidden-lg\" colspan=\"{{showKindAndName ? 3 : 2}}\">\n" +
"<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
"<span ng-if=\"(events | hashSize) > 0\">\n" +
"All events hidden by filter.\n" +
"<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\">Clear Filter</a>\n" +
"</span>\n" +
"</td>\n" +
"<td class=\"hidden-xs hidden-sm hidden-md\" colspan=\"{{!resourceKind || !resourceName ? 6 : 4}}\">\n" +
"<td class=\"hidden-xs hidden-sm hidden-md\" colspan=\"{{showKindAndName ? 6 : 4}}\">\n" +
"<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
"<span ng-if=\"(events | hashSize) > 0\">\n" +
"All events hidden by filter.\n" +
Expand All @@ -22999,7 +23016,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<tbody ng-if=\"(filteredEvents | hashSize) > 0\">\n" +
"<tr ng-repeat=\"event in filteredEvents\">\n" +
"<td data-title=\"Time\" class=\"nowrap\">{{event.lastTimestamp | date:'mediumTime'}}</td>\n" +
"<td ng-if=\"!resourceKind || !resourceName\" data-title=\"Name\">\n" +
"<td ng-if=\"showKindAndName\" data-title=\"Name\">\n" +
"<div class=\"hidden-xs-block visible-sm-block visible-md-block hidden-lg-block\">\n" +
"<span ng-bind-html=\"event.involvedObject.kind | humanizeKind : true | highlightKeywords : filterExpressions\"></span>\n" +
"</div>\n" +
Expand All @@ -23008,7 +23025,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<span ng-if=\"!resourceURL\" ng-bind-html=\"event.involvedObject.name | highlightKeywords : filterExpressions\"></span>\n" +
"</span>\n" +
"</td>\n" +
"<td ng-if=\"!resourceKind || !resourceName\" class=\"hidden-sm hidden-md\" data-title=\"Kind\">\n" +
"<td ng-if=\"showKindAndName\" class=\"hidden-sm hidden-md\" data-title=\"Kind\">\n" +
"<span ng-bind-html=\"event.involvedObject.kind | humanizeKind : true | highlightKeywords : filterExpressions\"></span>\n" +
"</td>\n" +
"<td data-title=\"Severity\" class=\"hidden-xs hidden-sm hidden-md text-center severity-icon-td\">\n" +
Expand Down

0 comments on commit ee15d99

Please sign in to comment.