Skip to content

Commit ccb2405

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): 05de64a8417d48ef33ba4474c15aa271010895ab
1 parent f7dd565 commit ccb2405

File tree

1 file changed

+30
-11
lines changed

1 file changed

+30
-11
lines changed

pkg/assets/bindata.go

+30-11
Original file line numberDiff line numberDiff line change
@@ -5032,16 +5032,18 @@ var k, l, m = [], n = [];
50325032
a.alerts = a.alerts || {}, a.loading = !0, a.showGetStarted = !1, a.canCreate = void 0, a.search = {
50335033
text:""
50345034
};
5035-
var o = [ "metadata.name", 'metadata.annotations["openshift.io/display-name"]', 'metadata.annotations["openshift.io/description"]' ], p = function() {
5036-
a.projects = i.filterForKeywords(l, o, n);
5037-
}, q = function() {
5038-
var b = _.get(a, "sortConfig.currentField.id"), c = function(a) {
5035+
var o, p = [ "metadata.name", 'metadata.annotations["openshift.io/display-name"]', 'metadata.annotations["openshift.io/description"]', 'metadata.annotations["openshift.io/requester"]' ], q = function() {
5036+
a.projects = i.filterForKeywords(l, p, n);
5037+
}, r = function() {
5038+
var b = _.get(a, "sortConfig.currentField.id");
5039+
o !== b && (a.sortConfig.isAscending = "metadata.creationTimestamp" !== b);
5040+
var c = function(a) {
50395041
var c = _.get(a, b) || _.get(a, "metadata.name", "");
50405042
return c.toLowerCase();
50415043
};
5042-
l = _.sortByOrder(k, [ c ], [ a.sortConfig.isAscending ? "asc" :"desc" ]);
5043-
}, r = function() {
5044-
q(), p();
5044+
l = _.sortByOrder(k, [ c ], [ a.sortConfig.isAscending ? "asc" :"desc" ]), o = b;
5045+
}, s = function() {
5046+
r(), q();
50455047
};
50465048
a.sortConfig = {
50475049
fields:[ {
@@ -5052,18 +5054,26 @@ sortType:"alpha"
50525054
id:"metadata.name",
50535055
title:"Name",
50545056
sortType:"alpha"
5057+
}, {
5058+
id:'metadata.annotations["openshift.io/requester"]',
5059+
title:"Creator",
5060+
sortType:"alpha"
5061+
}, {
5062+
id:"metadata.creationTimestamp",
5063+
title:"Creation Date",
5064+
sortType:"alpha"
50555065
} ],
50565066
isAscending:!0,
5057-
onSortChange:r
5067+
onSortChange:s
50585068
}, f.getAlerts().forEach(function(b) {
50595069
a.alerts[b.name] = b.data;
50605070
}), f.clearAlerts(), a.$watch("search.text", _.debounce(function(b) {
5061-
n = i.generateKeywords(b), a.$apply(p);
5071+
n = i.generateKeywords(b), a.$apply(q);
50625072
}, 50, {
50635073
maxWait:250
50645074
})), g.withUser().then(function() {
50655075
m.push(h.watch("projects", a, function(b) {
5066-
k = _.toArray(b.by("metadata.name")), a.loading = !1, a.showGetStarted = _.isEmpty(k), r();
5076+
k = _.toArray(b.by("metadata.name")), a.loading = !1, a.showGetStarted = _.isEmpty(k), s();
50675077
}));
50685078
}), h.get("projectrequests", null, a, {
50695079
errorNotification:!1
@@ -25121,6 +25131,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
2512125131
"</div>\n" +
2512225132
"</form>\n" +
2512325133
"<span class=\"vertical-divider\"></span>\n" +
25134+
"<span class=\"projects-sort-label\">Sort by</span>\n" +
2512425135
"<div class=\"projects-sort\">\n" +
2512525136
"<div pf-sort config=\"sortConfig\" class=\"sort-controls\"></div>\n" +
2512625137
"</div>\n" +
@@ -25154,7 +25165,12 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
2515425165
"<a class=\"tile-target\" ng-href=\"project/{{project.metadata.name}}\">{{project | displayName}}</a>\n" +
2515525166
"<span ng-if=\"project.status.phase != 'Active'\" data-toggle=\"tooltip\" title=\"This project has been marked for deletion.\" class=\"pficon pficon-warning-triangle-o\"></span>\n" +
2515625167
"</h2>\n" +
25157-
"<p class=\"hidden-xs project-name-item\" ng-if=\"project | displayName : true\">{{project.metadata.name}}</p>\n" +
25168+
"<small>\n" +
25169+
"<span ng-if=\"project | displayName : true\">{{project.metadata.name}} &ndash;</span>\n" +
25170+
"created\n" +
25171+
"<span ng-if=\"project | annotation : 'openshift.io/requester'\">by {{project | annotation : 'openshift.io/requester'}}</span>\n" +
25172+
"<relative-timestamp timestamp=\"project.metadata.creationTimestamp\"></relative-timestamp>\n" +
25173+
"</small>\n" +
2515825174
"</div>\n" +
2515925175
"<div class=\"list-view-pf-additional-info project-additional-info\">\n" +
2516025176
"<span class=\"list-group-item-text project-description\">\n" +
@@ -111778,6 +111794,9 @@ kubernetes-topology-graph{height:700px}
111778111794
.projects-bar .projects-search{display:flex;margin-bottom:20px}
111779111795
.projects-bar .projects-search .search-pf{display:block;flex:0 1 auto}
111780111796
.projects-bar .projects-search .search-pf.has-button .form-group{display:block}
111797+
.projects-bar .projects-sort-label{margin-right:6px;padding-top:3px}
111798+
@media (max-width:767px){.projects-bar .projects-sort-label{display:none!important}
111799+
}
111781111800
.projects-bar .projects-sort{flex:1 0 auto}
111782111801
.projects-bar .projects-sort .form-group{margin:0}
111783111802
.projects-bar .vertical-divider{border-left:1px solid #bbb;display:inline-block;height:27px;margin:0 7px;vertical-align:middle;width:1px}

0 commit comments

Comments
 (0)