diff --git a/assets/app/scripts/filters/util.js b/assets/app/scripts/filters/util.js index 8629397c53e8..d0d2d1fe6a54 100644 --- a/assets/app/scripts/filters/util.js +++ b/assets/app/scripts/filters/util.js @@ -19,11 +19,56 @@ angular.module('openshiftConsole') } var number = split[1]; if (number.indexOf(".") >= 0) { - return parseFloat(number); + var number = parseFloat(number); } else { - return parseInt(split[1]); + var number = parseInt(split[1]); } + var siSuffix = split[2]; + var multiplier = 1; + switch(siSuffix) { + case 'E': + multiplier = Math.pow(1000, 6); + break; + case 'P': + multiplier = Math.pow(1000, 5); + break; + case 'T': + multiplier = Math.pow(1000, 4); + break; + case 'G': + multiplier = Math.pow(1000, 3); + break; + case 'M': + multiplier = Math.pow(1000, 2); + break; + case 'K': + multiplier = 1000; + break; + case 'm': + multiplier = 0.001; + break; + case 'Ei': + multiplier = Math.pow(1024, 6); + break; + case 'Pi': + multiplier = Math.pow(1024, 5); + break; + case 'Ti': + multiplier = Math.pow(1024, 4); + break; + case 'Gi': + multiplier = Math.pow(1024, 3); + break; + case 'Mi': + multiplier = Math.pow(1024, 2); + break; + case 'Ki': + multiplier = 1024; + break; + } + + return number * multiplier; }; }) .filter('usageWithUnits', function() { diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go index f1e9adf12106..f978358b7e7c 100644 --- a/pkg/assets/bindata.go +++ b/pkg/assets/bindata.go @@ -12625,7 +12625,7 @@ return d + "-" + a.slice(0, 2).join("-") + "T" + a.slice(2).join(":") + "." + (" }); var F = !1; try { -F = Date.prototype.toJSON && null === new Date(0/0).toJSON() && -1 !== new Date(D).toJSON().indexOf(E) && Date.prototype.toJSON.call({ +F = Date.prototype.toJSON && null === new Date(0 / 0).toJSON() && -1 !== new Date(D).toJSON().indexOf(E) && Date.prototype.toJSON.call({ toISOString:function() { return !0; } @@ -12660,7 +12660,7 @@ return b.now = a.now, b.UTC = a.UTC, b.prototype = a.prototype, b.prototype.cons var f = e.exec(b); if (f) { var g, h = Number(f[1]), i = Number(f[2] || 1) - 1, j = Number(f[3] || 1) - 1, k = Number(f[4] || 0), l = Number(f[5] || 0), m = Number(f[6] || 0), n = Math.floor(1e3 * Number(f[7] || 0)), o = Boolean(f[4] && !f[8]), p = "-" === f[9] ? 1 :-1, q = Number(f[10] || 0), r = Number(f[11] || 0); -return (l > 0 || m > 0 || n > 0 ? 24 :25) > k && 60 > l && 60 > m && 1e3 > n && i > -1 && 12 > i && 24 > q && 60 > r && j > -1 && j < c(h, i + 1) - c(h, i) && (g = 60 * (24 * (c(h, i) + j) + k + q * p), g = 1e3 * (60 * (g + l + r * p) + m) + n, o && (g = d(g)), g >= -864e13 && 864e13 >= g) ? g :0/0; +return (l > 0 || m > 0 || n > 0 ? 24 :25) > k && 60 > l && 60 > m && 1e3 > n && i > -1 && 12 > i && 24 > q && 60 > r && j > -1 && j < c(h, i + 1) - c(h, i) && (g = 60 * (24 * (c(h, i) + j) + k + q * p), g = 1e3 * (60 * (g + l + r * p) + m) + n, o && (g = d(g)), g >= -864e13 && 864e13 >= g) ? g :0 / 0; } return a.parse.apply(this, arguments); }, b; @@ -12742,7 +12742,7 @@ String.prototype.substr = function(a, b) { return N.call(this, 0 > a && (a = this.length + a) < 0 ? 0 :a, b); }; } -var O = " \n \f\r   ᠎              \u2028\u2029`+"\xEF\xBB\xBF"+`", P = "​"; +var O = " \n \f\r   ᠎              \u2028\u2029\ufeff", P = "​"; if (!String.prototype.trim || O.trim() || !P.trim()) { O = "[" + O + "]"; var Q = new RegExp("^" + O + O + "*"), R = new RegExp(O + O + "*$"); @@ -14722,7 +14722,61 @@ if (!a) return a; var b = /(-?[0-9\.]+)\s*(.*)/.exec(a); if (!b) return a; var c = b[1]; -return c.indexOf(".") >= 0 ? parseFloat(c) :parseInt(b[1]); +if (c.indexOf(".") >= 0) var c = parseFloat(c); else var c = parseInt(b[1]); +var d = b[2], e = 1; +switch (d) { +case "E": +e = Math.pow(1e3, 6); +break; + +case "P": +e = Math.pow(1e3, 5); +break; + +case "T": +e = Math.pow(1e3, 4); +break; + +case "G": +e = Math.pow(1e3, 3); +break; + +case "M": +e = Math.pow(1e3, 2); +break; + +case "K": +e = 1e3; +break; + +case "m": +e = .001; +break; + +case "Ei": +e = Math.pow(1024, 6); +break; + +case "Pi": +e = Math.pow(1024, 5); +break; + +case "Ti": +e = Math.pow(1024, 4); +break; + +case "Gi": +e = Math.pow(1024, 3); +break; + +case "Mi": +e = Math.pow(1024, 2); +break; + +case "Ki": +e = 1024; +} +return c * e; }; }).filter("usageWithUnits", function() { return function(a, b) { @@ -14820,7 +14874,7 @@ var b = this, c = q.call(arguments, 1); return function() { return da.call(b, a, c.concat(q.call(arguments))); }; -}, u = t.call(Function.prototype.call, p.hasOwnProperty), ha = "a" != Object("a")[0] || !(0 in Object("a")), ia = p.toString, ca = "every filter forEach indexOf join lastIndexOf map reduce reduceRight reverse slice some toString".split(" "), y = n.Element && n.Element.prototype || {}, z = t.call(document.__orig__createElement__ || document.createElement, document), A = z("p"), B, ma = /\\s+$/g, na = /\\s+/g, C = 1, D, oa = /^(\w+)?((?:\.(?:[\w\-]+))+)?$|^#([\w\-]+$)/, pa = /\s*([,>+~ ])\s*/g, qa, E, F, G, I, J, K, ra, sa, ta, ua, L, va, M, N = " \n \f\r   ᠎              \u2028\u2029`+"\xEF\xBB\xBF"+`", wa, xa, ya, za, O, Q, Aa, Ba, R, S = n.Date, T, Ca, U, V, W, Da, Ga, X, Y; +}, u = t.call(Function.prototype.call, p.hasOwnProperty), ha = "a" != Object("a")[0] || !(0 in Object("a")), ia = p.toString, ca = "every filter forEach indexOf join lastIndexOf map reduce reduceRight reverse slice some toString".split(" "), y = n.Element && n.Element.prototype || {}, z = t.call(document.__orig__createElement__ || document.createElement, document), A = z("p"), B, ma = /\\s+$/g, na = /\\s+/g, C = 1, D, oa = /^(\w+)?((?:\.(?:[\w\-]+))+)?$|^#([\w\-]+$)/, pa = /\s*([,>+~ ])\s*/g, qa, E, F, G, I, J, K, ra, sa, ta, ua, L, va, M, N = " \n \f\r   ᠎              \u2028\u2029\ufeff", wa, xa, ya, za, O, Q, Aa, Ba, R, S = n.Date, T, Ca, U, V, W, Da, Ga, X, Y; for (W = {}, W.names = (W.agent = navigator.userAgent.toLowerCase()).match(/(mozilla|compatible|chrome|webkit|safari|opera|msie|iphone|ipod|ipad)/gi), D = W.names && W.names.length || 0; 0 < D--; ) W[W.names[D]] = j; @@ -15044,7 +15098,7 @@ isInteger:function(a) { return Number.isFinite(a) && a >= -9007199254740992 && 9007199254740992 >= a && Math.floor(a) === a; }, isNaN:function(a) { -return Object.is(a, 0/0); +return Object.is(a, 0 / 0); }, toInteger:function(a) { return a = +a, Number.isNaN(a) ? 0 :0 !== a && n.i(a) ? (0 > a ? -1 :1) * Math.floor(Math.abs(a)) :a; @@ -15374,7 +15428,7 @@ T.now = S.now, T.UTC = S.UTC, T.prototype = S.prototype, T.prototype.constructor var b = Ca.exec(a); if (b) { var c = Number(b[1]), d = Number(b[2] || 1), e = Number(b[3] || 1), f = Number(b[4] || 0), g = Number(b[5] || 0), h = Number(b[6] || 0), i = Number(b[7] || 0), j = b[8] ? 0 :Number(new Date(1970, 0)), k = "-" === b[9] ? 1 :-1, l = Number(b[10] || 0), b = Number(b[11] || 0), m = V(c), n = V(c + 1); -return (g > 0 || h > 0 || i > 0 ? 24 :25) > f && 60 > g && 60 > h && 1e3 > i && 24 > l && 60 > b && d > 0 && 13 > d && e > 0 && e < 1 + U[d] - U[d - 1] + (2 === d ? n - m :0) && (c = 365 * (c - 1970) + (d > 2 ? n :m) - V(1970) + U[d - 1] + e - 1, c = 1e3 * (60 * (60 * (24 * c + f + l * k) + g + b * k) + h) + i + j, c >= -864e13 && 864e13 >= c) ? c :0/0; +return (g > 0 || h > 0 || i > 0 ? 24 :25) > f && 60 > g && 60 > h && 1e3 > i && 24 > l && 60 > b && d > 0 && 13 > d && e > 0 && e < 1 + U[d] - U[d - 1] + (2 === d ? n - m :0) && (c = 365 * (c - 1970) + (d > 2 ? n :m) - V(1970) + U[d - 1] + e - 1, c = 1e3 * (60 * (60 * (24 * c + f + l * k) + g + b * k) + h) + i + j, c >= -864e13 && 864e13 >= c) ? c :0 / 0; } return S.parse.apply(this, arguments); }, n.Date = T; @@ -15398,7 +15452,7 @@ if (b.nodeType) return _.grep(a, function(a) { return a === b !== c; }); if ("string" == typeof b) { -if (hb.test(b)) return _.filter(b, a, c); +if (ha.test(b)) return _.filter(b, a, c); b = _.filter(b, a); } return _.grep(a, function(a) { @@ -15410,8 +15464,8 @@ for (;(a = a[b]) && 1 !== a.nodeType; ) ; return a; } function f(a) { -var b = ob[a] = {}; -return _.each(a.match(nb) || [], function(a, c) { +var b = oa[a] = {}; +return _.each(a.match(na) || [], function(a, c) { b[c] = !0; }), b; } @@ -15427,11 +15481,11 @@ return {}; } function i(a, b, c) { var d; -if (void 0 === c && 1 === a.nodeType) if (d = "data-" + b.replace(ub, "-$1").toLowerCase(), c = a.getAttribute(d), "string" == typeof c) { +if (void 0 === c && 1 === a.nodeType) if (d = "data-" + b.replace(ua, "-$1").toLowerCase(), c = a.getAttribute(d), "string" == typeof c) { try { -c = "true" === c ? !0 :"false" === c ? !1 :"null" === c ? null :+c + "" === c ? +c :tb.test(c) ? _.parseJSON(c) :c; +c = "true" === c ? !0 :"false" === c ? !1 :"null" === c ? null :+c + "" === c ? +c :ta.test(c) ? _.parseJSON(c) :c; } catch (e) {} -sb.set(a, b, c); +sa.set(a, b, c); } else c = void 0; return c; } @@ -15453,20 +15507,20 @@ function n(a) { return a.type = (null !== a.getAttribute("type")) + "/" + a.type, a; } function o(a) { -var b = Kb.exec(a.type); +var b = Ka.exec(a.type); return b ? a.type = b[1] :a.removeAttribute("type"), a; } function p(a, b) { -for (var c = 0, d = a.length; d > c; c++) rb.set(a[c], "globalEval", !b || rb.get(b[c], "globalEval")); +for (var c = 0, d = a.length; d > c; c++) ra.set(a[c], "globalEval", !b || ra.get(b[c], "globalEval")); } function q(a, b) { var c, d, e, f, g, h, i, j; if (1 === b.nodeType) { -if (rb.hasData(a) && (f = rb.access(a), g = rb.set(b, f), j = f.events)) { +if (ra.hasData(a) && (f = ra.access(a), g = ra.set(b, f), j = f.events)) { delete g.handle, g.events = {}; for (e in j) for (c = 0, d = j[e].length; d > c; c++) _.event.add(b, e, j[e][c]); } -sb.hasData(a) && (h = sb.access(a), i = _.extend({}, h), sb.set(b, i)); +sa.hasData(a) && (h = sa.access(a), i = _.extend({}, h), sa.set(b, i)); } } function r(a, b) { @@ -15475,19 +15529,19 @@ return void 0 === b || b && _.nodeName(a, b) ? _.merge([ a ], c) :c; } function s(a, b) { var c = b.nodeName.toLowerCase(); -"input" === c && yb.test(a.type) ? b.checked = a.checked :("input" === c || "textarea" === c) && (b.defaultValue = a.defaultValue); +"input" === c && ya.test(a.type) ? b.checked = a.checked :("input" === c || "textarea" === c) && (b.defaultValue = a.defaultValue); } function t(b, c) { var d, e = _(c.createElement(b)).appendTo(c.body), f = a.getDefaultComputedStyle && (d = a.getDefaultComputedStyle(e[0])) ? d.display :_.css(e[0], "display"); return e.detach(), f; } function u(a) { -var b = Z, c = Ob[a]; -return c || (c = t(a, b), "none" !== c && c || (Nb = (Nb || _("