Loading...There are no resource quotas set on this project.
{{emptyMessageLimitRanges}}
| {{limit.type}} {{type | computeResourceLabel : true}} | {{(typeLimits.min | usageWithUnits : type) || "—"}} | {{(typeLimits.max | usageWithUnits : type) || "—"}} | diff --git a/bower.json b/bower.json index 1ce7e75347..cd16bcce56 100644 --- a/bower.json +++ b/bower.json @@ -2,22 +2,23 @@ "name": "origin-web-console", "version": "1.3.0-alpha", "dependencies": { - "angular": "1.3.20", + "angular": "1.5.11", "json3": "3.3.2", "es5-shim": "3.1.1", - "angular-resource": "1.3.20", - "angular-cookies": "1.3.20", - "angular-sanitize": "1.3.20", - "angular-animate": "1.3.20", - "angular-touch": "1.3.20", - "angular-route": "1.3.20", + "es5-dom-shim": "*", + "angular-resource": "1.5.11", + "angular-cookies": "1.5.11", + "angular-sanitize": "1.5.11", + "angular-animate": "1.5.11", + "angular-touch": "1.5.11", + "angular-route": "1.5.11", "angular-bootstrap": "0.14.3", - "angular-patternfly": "3.10.0", + "angular-patternfly": "3.18.1", "uri.js": "1.18.0", "moment": "2.14.2", "moment-timezone": "0.5.3", - "patternfly": "3.10.0", - "hawtio-core": "2.0.11", + "patternfly": "3.18.1", + "hawtio-core": "2.0.37", "hawtio-extension-service": "2.0.2", "jquery": "2.1.4", "lodash": "3.10.1", @@ -25,11 +26,11 @@ "microplugin": "0.0.3", "selectize": "0.12.1", "messenger": "1.4.1", - "kubernetes-label-selector": "1.4.1", + "kubernetes-label-selector": "1.4.2", "kubernetes-topology-graph": "0.0.23", - "kubernetes-container-terminal": "1.0.1", + "kubernetes-container-terminal": "1.0.3", "registry-image-widgets": "0.0.2", - "openshift-object-describer": "1.1.2", + "openshift-object-describer": "1.1.4", "layout.attrs": "2.1.1", "bootstrap-hover-dropdown": "2.1.3", "angular-ui-ace": "0.2.3", @@ -40,7 +41,7 @@ "ng-sortable": "1.3.4", "ui-select": "angular-ui-select#0.19.4", "matchHeight": "0.7.0", - "angular-key-value-editor": "2.9.2", + "angular-key-value-editor": "3.0.0", "angular-inview": "1.5.7", "js-yaml": "3.6.1", "angular-moment": "1.0.0", @@ -48,8 +49,8 @@ "file-saver": "1.3.3" }, "devDependencies": { - "angular-mocks": "1.3.20", - "angular-scenario": "1.3.20" + "angular-mocks": "1.5.11", + "angular-scenario": "1.5.11" }, "appPath": "app", "resolutions": { diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index f7a22dc2e2..c8a4d0b493 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -5109,9 +5109,9 @@ b[a.metadata.name] = d; }; e.get(b.project).then(_.spread(function(a, e) { c.project = a, d.list("resourcequotas", e, function(a) { -c.quotas = a.by("metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas); +c.quotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas); }), d.list("appliedclusterresourcequotas", e, function(a) { -c.clusterQuotas = a.by("metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) { +c.clusterQuotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) { if (a.status) { var e = _.find(a.status.namespaces, { namespace:b.project @@ -5120,7 +5120,8 @@ c.namespaceUsageByClusterQuota[d] = e.status; } }), f.log("cluster quotas", c.clusterQuotas); }), d.list("limitranges", e, function(a) { -c.limitRanges = a.by("metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a, b) { +c.limitRanges = _.sortBy(a.by("metadata.name"), "metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a) { +var b = a.metadata.name; c.limitsByType[b] = {}, angular.forEach(a.spec.limits, function(a) { var d = c.limitsByType[b][a.type] = {}; angular.forEach(a.max, function(a, b) { @@ -5949,7 +5950,7 @@ d.unwatchAll(i); }); })); } ]), angular.module("openshiftConsole").controller("ImageStreamController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", "ImageStreamsService", function(a, b, c, d, e, f) { -a.projectName = b.project, a.imageStream = null, a.tagsByName = {}, a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ { +a.projectName = b.project, a.imageStream = null, a.tags = [], a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ { title:"Image Streams", link:"project/" + b.project + "/browse/images" }, { @@ -5962,7 +5963,7 @@ a.loaded = !0, a.imageStream = d, a.emptyMessage = "No tags to show", g.push(c.w "DELETED" === c && (a.alerts.deleted = { type:"warning", message:"This image stream has been deleted." -}), a.imageStream = b, a.tagsByName = f.tagsByName(a.imageStream); +}), a.imageStream = b, a.tags = _.toArray(f.tagsByName(a.imageStream)); })); }, function(b) { a.loaded = !0, a.alerts.load = { diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index 4e3e8a979b..3859a41c30 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -3166,10 +3166,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "Pull Spec | \n" + "
|---|---|---|---|
| {{emptyMessage}} | |||
| \n" +
"{{tag.name}}\n" +
@@ -11328,22 +11328,22 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"\n" +
- " \n" +
+ " \n" +
" \n" +
"\n" +
"\n" +
- "\n" +
+ " \n" +
" \n" +
"\n" +
"\n" +
- "\n" +
+ " \n" +
" \n" +
"\n" +
"\n" +
- "\n" +
+ " \n" +
" \n" +
"\n" +
@@ -12309,19 +12309,19 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
" \n" +
" \n" + - "Cluster Quota\n" + + "Cluster Quota\n" + "\n" + "\n" + "Learn More \n" + "\n" + "\n" + "\n" + - "\n" +
+ " \n" +
" \n" +
"{{quotaHelp}} \n" +
"Loading...There are no resource quotas set on this project. \n" + "\n" +
- " 1\">{{quota.metadata.name}}\n" + + "{{quota.metadata.name}}\n" + "Limits resource usage across a set of projects. \n" +
"
|
{{emptyMessageLimitRanges}}
\n" + "| {{limit.type}} {{type | computeResourceLabel : true}} | \n" + "{{(typeLimits.min | usageWithUnits : type) || \"—\"}} | \n" + "{{(typeLimits.max | usageWithUnits : type) || \"—\"}} | \n" + diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js index 2d89b202e1..924e04bfe6 100644 --- a/dist/scripts/vendor.js +++ b/dist/scripts/vendor.js @@ -3211,74 +3211,81 @@ var Kb = a.jQuery, Lb = a.$; return _.noConflict = function(b) { return a.$ === _ && (a.$ = Lb), b && a.jQuery === _ && (a.jQuery = Kb), _; }, typeof b === za && (a.jQuery = a.$ = _), _; -}), function(a, b, c) { +}), function(a) { "use strict"; -function d(a, b) { +function b(a, b) { return b = b || Error, function() { -var c, d, e = arguments[0], f = "[" + (a ? a + ":" :"") + e + "] ", g = arguments[1], h = arguments; -for (c = f + g.replace(/\{\d+\}/g, function(a) { -var b = +a.slice(1, -1); -return b + 2 < h.length ? ma(h[b + 2]) :a; -}), c = c + "\nhttp://errors.angularjs.org/1.3.20/" + (a ? a + "/" :"") + e, d = 2; d < arguments.length; d++) c = c + (2 == d ? "?" :"&") + "p" + (d - 2) + "=" + encodeURIComponent(ma(arguments[d])); -return new b(c); +var c, d, e = 2, f = arguments, g = f[0], h = "[" + (a ? a + ":" :"") + g + "] ", i = f[1]; +for (h += i.replace(/\{\d+\}/g, function(a) { +var b = +a.slice(1, -1), c = b + e; +return c < f.length ? ta(f[c]) :a; +}), h += "\nhttp://errors.angularjs.org/1.5.11/" + (a ? a + "/" :"") + g, d = e, c = "?"; d < f.length; d++, c = "&") h += c + "p" + (d - e) + "=" + encodeURIComponent(ta(f[d])); +return new b(h); }; } -function e(a) { -if (null == a || z(a)) return !1; +function c(a) { +if (null == a || A(a)) return !1; +if (ce(a) || v(a) || Sd && a instanceof Sd) return !0; var b = "length" in Object(a) && a.length; -return !(a.nodeType !== td || !b) || (u(a) || md(a) || 0 === b || "number" == typeof b && b > 0 && b - 1 in a); +return w(b) && (b >= 0 && (b - 1 in a || a instanceof Array) || "function" == typeof a.item); } -function f(a, b, c) { -var d, g; -if (a) if (x(a)) for (d in a) "prototype" == d || "length" == d || "name" == d || a.hasOwnProperty && !a.hasOwnProperty(d) || b.call(c, a[d], d, a); else if (md(a) || e(a)) { +function d(a, b, e) { +var f, g; +if (a) if (y(a)) for (f in a) "prototype" === f || "length" === f || "name" === f || a.hasOwnProperty && !a.hasOwnProperty(f) || b.call(e, a[f], f, a); else if (ce(a) || c(a)) { var h = "object" != typeof a; -for (d = 0, g = a.length; d < g; d++) (h || d in a) && b.call(c, a[d], d, a); -} else if (a.forEach && a.forEach !== f) a.forEach(b, c, a); else for (d in a) a.hasOwnProperty(d) && b.call(c, a[d], d, a); +for (f = 0, g = a.length; f < g; f++) (h || f in a) && b.call(e, a[f], f, a); +} else if (a.forEach && a.forEach !== d) a.forEach(b, e, a); else if (u(a)) for (f in a) b.call(e, a[f], f, a); else if ("function" == typeof a.hasOwnProperty) for (f in a) a.hasOwnProperty(f) && b.call(e, a[f], f, a); else for (f in a) Md.call(a, f) && b.call(e, a[f], f, a); return a; } -function g(a) { -return Object.keys(a).sort(); -} -function h(a, b, c) { -for (var d = g(a), e = 0; e < d.length; e++) b.call(c, a[d[e]], d[e]); +function e(a, b, c) { +for (var d = Object.keys(a).sort(), e = 0; e < d.length; e++) b.call(c, a[d[e]], d[e]); return d; } -function i(a) { +function f(a) { return function(b, c) { a(c, b); }; } -function j() { -return ++kd; +function g() { +return ++ae; } -function k(a, b) { +function h(a, b) { b ? a.$$hashKey = b :delete a.$$hashKey; } -function l(a) { -for (var b = a.$$hashKey, c = 1, d = arguments.length; c < d; c++) { -var e = arguments[c]; -if (e) for (var f = Object.keys(e), g = 0, h = f.length; g < h; g++) { -var i = f[g]; -a[i] = e[i]; +function i(a, b, c) { +for (var d = a.$$hashKey, e = 0, f = b.length; e < f; ++e) { +var g = b[e]; +if (t(g) || y(g)) for (var j = Object.keys(g), k = 0, l = j.length; k < l; k++) { +var m = j[k], n = g[m]; +c && t(n) ? x(n) ? a[m] = new Date(n.valueOf()) :z(n) ? a[m] = new RegExp(n) :n.nodeName ? a[m] = n.cloneNode(!0) :J(n) ? a[m] = n.clone() :(t(a[m]) || (a[m] = ce(n) ? [] :{}), i(a[m], [ n ], !0)) :a[m] = n; } } -return k(a, b), a; +return h(a, d), a; } -function m(a) { +function j(a) { +return i(a, Vd.call(arguments, 1), !1); +} +function k(a) { +return i(a, Vd.call(arguments, 1), !0); +} +function l(a) { return parseInt(a, 10); } -function n(a, b) { -return l(Object.create(a), b); +function m(a, b) { +return j(Object.create(a), b); } -function o() {} -function p(a) { +function n() {} +function o(a) { return a; } -function q(a) { +function p(a) { return function() { return a; }; } +function q(a) { +return y(a.toString) && a.toString !== Yd; +} function r(a) { return "undefined" == typeof a; } @@ -3289,558 +3296,656 @@ function t(a) { return null !== a && "object" == typeof a; } function u(a) { -return "string" == typeof a; +return null !== a && "object" == typeof a && !Zd(a); } function v(a) { -return "number" == typeof a; +return "string" == typeof a; } function w(a) { -return "[object Date]" === hd.call(a); +return "number" == typeof a; } function x(a) { -return "function" == typeof a; +return "[object Date]" === Yd.call(a); } function y(a) { -return "[object RegExp]" === hd.call(a); +return "function" == typeof a; } function z(a) { -return a && a.window === a; +return "[object RegExp]" === Yd.call(a); } function A(a) { -return a && a.$evalAsync && a.$watch; +return a && a.window === a; } function B(a) { -return "[object File]" === hd.call(a); +return a && a.$evalAsync && a.$watch; } function C(a) { -return "[object FormData]" === hd.call(a); +return "[object File]" === Yd.call(a); } function D(a) { -return "[object Blob]" === hd.call(a); +return "[object FormData]" === Yd.call(a); } function E(a) { -return "boolean" == typeof a; +return "[object Blob]" === Yd.call(a); } function F(a) { -return a && x(a.then); +return "boolean" == typeof a; } function G(a) { -return !(!a || !(a.nodeName || a.prop && a.attr && a.find)); +return a && y(a.then); } function H(a) { +return a && w(a.length) && de.test(Yd.call(a)); +} +function I(a) { +return "[object ArrayBuffer]" === Yd.call(a); +} +function J(a) { +return !(!a || !(a.nodeName || a.prop && a.attr && a.find)); +} +function K(a) { var b, c = {}, d = a.split(","); for (b = 0; b < d.length; b++) c[d[b]] = !0; return c; } -function I(a) { -return Xc(a.nodeName || a[0] && a[0].nodeName); +function L(a) { +return Nd(a.nodeName || a[0] && a[0].nodeName); } -function J(a, b) { +function M(a, b) { var c = a.indexOf(b); -return c >= 0 && a.splice(c, 1), b; +return c >= 0 && a.splice(c, 1), c; } -function K(a, b, c, d) { -if (z(a) || A(a)) throw id("cpws", "Can't copy! Making copies of Window or Scope instances is not supported."); -if (b) { -if (a === b) throw id("cpi", "Can't copy! Source and destination are identical."); -if (c = c || [], d = d || [], t(a)) { -var e = c.indexOf(a); -if (e !== -1) return d[e]; -c.push(a), d.push(b); +function N(a, b) { +function c(a, b) { +var c, d = b.$$hashKey; +if (ce(a)) for (var f = 0, g = a.length; f < g; f++) b.push(e(a[f])); else if (u(a)) for (c in a) b[c] = e(a[c]); else if (a && "function" == typeof a.hasOwnProperty) for (c in a) a.hasOwnProperty(c) && (b[c] = e(a[c])); else for (c in a) Md.call(a, c) && (b[c] = e(a[c])); +return h(b, d), b; } -var g; -if (md(a)) { -b.length = 0; -for (var h = 0; h < a.length; h++) g = K(a[h], null, c, d), t(a[h]) && (c.push(a[h]), d.push(g)), b.push(g); -} else { -var i = b.$$hashKey; -md(b) ? b.length = 0 :f(b, function(a, c) { -delete b[c]; -}); -for (var j in a) a.hasOwnProperty(j) && (g = K(a[j], null, c, d), t(a[j]) && (c.push(a[j]), d.push(g)), b[j] = g); -k(b, i); +function e(a) { +if (!t(a)) return a; +var b = g.indexOf(a); +if (b !== -1) return i[b]; +if (A(a) || B(a)) throw $d("cpws", "Can't copy! Making copies of Window or Scope instances is not supported."); +var d = !1, e = f(a); +return void 0 === e && (e = ce(a) ? [] :Object.create(Zd(a)), d = !0), g.push(a), i.push(e), d ? c(a, e) :e; } -} else if (b = a, a) if (md(a)) b = K(a, [], c, d); else if (w(a)) b = new Date(a.getTime()); else if (y(a)) b = new RegExp(a.source, a.toString().match(/[^\/]*$/)[0]), b.lastIndex = a.lastIndex; else if (t(a)) { -var l = Object.create(Object.getPrototypeOf(a)); -b = K(a, l, c, d); +function f(a) { +switch (Yd.call(a)) { +case "[object Int8Array]": +case "[object Int16Array]": +case "[object Int32Array]": +case "[object Float32Array]": +case "[object Float64Array]": +case "[object Uint8Array]": +case "[object Uint8ClampedArray]": +case "[object Uint16Array]": +case "[object Uint32Array]": +return new a.constructor(e(a.buffer), a.byteOffset, a.length); + +case "[object ArrayBuffer]": +if (!a.slice) { +var b = new ArrayBuffer(a.byteLength); +return new Uint8Array(b).set(new Uint8Array(a)), b; +} +return a.slice(0); + +case "[object Boolean]": +case "[object Number]": +case "[object String]": +case "[object Date]": +return new a.constructor(a.valueOf()); + +case "[object RegExp]": +var c = new RegExp(a.source, a.toString().match(/[^\/]*$/)[0]); +return c.lastIndex = a.lastIndex, c; + +case "[object Blob]": +return new a.constructor([ a ], { +type:a.type +}); } -return b; +if (y(a.cloneNode)) return a.cloneNode(!0); } -function L(a, b) { -if (md(a)) { -b = b || []; -for (var c = 0, d = a.length; c < d; c++) b[c] = a[c]; -} else if (t(a)) { -b = b || {}; -for (var e in a) "$" === e.charAt(0) && "$" === e.charAt(1) || (b[e] = a[e]); +var g = [], i = []; +if (b) { +if (H(b) || I(b)) throw $d("cpta", "Can't copy! TypedArray destination cannot be mutated."); +if (a === b) throw $d("cpi", "Can't copy! Source and destination are identical."); +return ce(b) ? b.length = 0 :d(b, function(a, c) { +"$$hashKey" !== c && delete b[c]; +}), g.push(a), i.push(b), c(a, b); } -return b || a; +return e(a); } -function M(a, b) { +function O(a, b) { if (a === b) return !0; if (null === a || null === b) return !1; if (a !== a && b !== b) return !0; -var d, e, f, g = typeof a, h = typeof b; -if (g == h && "object" == g) { -if (!md(a)) { -if (w(a)) return !!w(b) && M(a.getTime(), b.getTime()); -if (y(a)) return !!y(b) && a.toString() == b.toString(); -if (A(a) || A(b) || z(a) || z(b) || md(b) || w(b) || y(b)) return !1; -f = {}; -for (e in a) if ("$" !== e.charAt(0) && !x(a[e])) { -if (!M(a[e], b[e])) return !1; -f[e] = !0; -} -for (e in b) if (!f.hasOwnProperty(e) && "$" !== e.charAt(0) && b[e] !== c && !x(b[e])) return !1; +var c, d, e, f = typeof a, g = typeof b; +if (f === g && "object" === f) { +if (!ce(a)) { +if (x(a)) return !!x(b) && O(a.getTime(), b.getTime()); +if (z(a)) return !!z(b) && a.toString() === b.toString(); +if (B(a) || B(b) || A(a) || A(b) || ce(b) || x(b) || z(b)) return !1; +e = pa(); +for (d in a) if ("$" !== d.charAt(0) && !y(a[d])) { +if (!O(a[d], b[d])) return !1; +e[d] = !0; +} +for (d in b) if (!(d in e) && "$" !== d.charAt(0) && s(b[d]) && !y(b[d])) return !1; return !0; } -if (!md(b)) return !1; -if ((d = a.length) == b.length) { -for (e = 0; e < d; e++) if (!M(a[e], b[e])) return !1; +if (!ce(b)) return !1; +if ((c = a.length) === b.length) { +for (d = 0; d < c; d++) if (!O(a[d], b[d])) return !1; return !0; } } return !1; } -function N(a, b, c) { -return a.concat(ed.call(b, c)); +function P(a, b, c) { +return a.concat(Vd.call(b, c)); } -function O(a, b) { -return ed.call(a, b || 0); +function Q(a, b) { +return Vd.call(a, b || 0); } -function P(a, b) { -var c = arguments.length > 2 ? O(arguments, 2) :[]; -return !x(b) || b instanceof RegExp ? b :c.length ? function() { -return arguments.length ? b.apply(a, N(c, arguments, 0)) :b.apply(a, c); +function R(a, b) { +var c = arguments.length > 2 ? Q(arguments, 2) :[]; +return !y(b) || b instanceof RegExp ? b :c.length ? function() { +return arguments.length ? b.apply(a, P(c, arguments, 0)) :b.apply(a, c); } :function() { return arguments.length ? b.apply(a, arguments) :b.call(a); }; } -function Q(a, d) { -var e = d; -return "string" == typeof a && "$" === a.charAt(0) && "$" === a.charAt(1) ? e = c :z(d) ? e = "$WINDOW" :d && b === d ? e = "$DOCUMENT" :A(d) && (e = "$SCOPE"), e; +function S(b, c) { +var d = c; +return "string" == typeof b && "$" === b.charAt(0) && "$" === b.charAt(1) ? d = void 0 :A(c) ? d = "$WINDOW" :c && a.document === c ? d = "$DOCUMENT" :B(c) && (d = "$SCOPE"), d; } -function R(a, b) { -return "undefined" == typeof a ? c :(v(b) || (b = b ? 2 :null), JSON.stringify(a, Q, b)); +function T(a, b) { +if (!r(a)) return w(b) || (b = b ? 2 :null), JSON.stringify(a, S, b); } -function S(a) { -return u(a) ? JSON.parse(a) :a; +function U(a) { +return v(a) ? JSON.parse(a) :a; } -function T(a) { -a = bd(a).clone(); +function V(a, b) { +a = a.replace(ie, ""); +var c = Date.parse("Jan 01, 1970 00:00:00 " + a) / 6e4; +return be(c) ? b :c; +} +function W(a, b) { +return a = new Date(a.getTime()), a.setMinutes(a.getMinutes() + b), a; +} +function X(a, b, c) { +c = c ? -1 :1; +var d = a.getTimezoneOffset(), e = V(b, d); +return W(a, c * (e - d)); +} +function Y(a) { +a = Sd(a).clone(); try { a.empty(); } catch (b) {} -var c = bd("