From e72d0fb75556e3264aac9914381373fbfa05c991 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Thu, 19 Oct 2017 11:50:11 -0400 Subject: [PATCH] Add product icons for service catalog --- app/images/logos/3scale.svg | 1 + app/images/logos/amq.svg | 1 + app/images/logos/datagrid.svg | 1 + app/images/logos/datavirt.svg | 1 + app/images/logos/decisionserver.svg | 1 + app/images/logos/eap.svg | 1 + app/images/logos/processserver.svg | 1 + app/images/logos/rh-integration.svg | 1 + app/images/logos/rh-tomcat.svg | 1 + app/images/logos/sso.svg | 1 + app/scripts/constants.js | 12 ++ dist/images/logos/3scale.svg | 1 + dist/images/logos/amq.svg | 1 + dist/images/logos/datagrid.svg | 1 + dist/images/logos/datavirt.svg | 1 + dist/images/logos/decisionserver.svg | 1 + dist/images/logos/eap.svg | 1 + dist/images/logos/processserver.svg | 1 + dist/images/logos/rh-integration.svg | 1 + dist/images/logos/rh-tomcat.svg | 1 + dist/images/logos/sso.svg | 1 + dist/scripts/scripts.js | 255 ++++++++++++++------------- 22 files changed, 165 insertions(+), 122 deletions(-) create mode 100755 app/images/logos/3scale.svg create mode 100755 app/images/logos/amq.svg create mode 100755 app/images/logos/datagrid.svg create mode 100755 app/images/logos/datavirt.svg create mode 100755 app/images/logos/decisionserver.svg create mode 100755 app/images/logos/eap.svg create mode 100755 app/images/logos/processserver.svg create mode 100755 app/images/logos/rh-integration.svg create mode 100755 app/images/logos/rh-tomcat.svg create mode 100755 app/images/logos/sso.svg create mode 100644 dist/images/logos/3scale.svg create mode 100644 dist/images/logos/amq.svg create mode 100644 dist/images/logos/datagrid.svg create mode 100644 dist/images/logos/datavirt.svg create mode 100644 dist/images/logos/decisionserver.svg create mode 100644 dist/images/logos/eap.svg create mode 100644 dist/images/logos/processserver.svg create mode 100644 dist/images/logos/rh-integration.svg create mode 100644 dist/images/logos/rh-tomcat.svg create mode 100644 dist/images/logos/sso.svg diff --git a/app/images/logos/3scale.svg b/app/images/logos/3scale.svg new file mode 100755 index 0000000000..a05577c346 --- /dev/null +++ b/app/images/logos/3scale.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/amq.svg b/app/images/logos/amq.svg new file mode 100755 index 0000000000..a18ad16d9e --- /dev/null +++ b/app/images/logos/amq.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/datagrid.svg b/app/images/logos/datagrid.svg new file mode 100755 index 0000000000..01aa5b600d --- /dev/null +++ b/app/images/logos/datagrid.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/datavirt.svg b/app/images/logos/datavirt.svg new file mode 100755 index 0000000000..21a7e73e8a --- /dev/null +++ b/app/images/logos/datavirt.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/decisionserver.svg b/app/images/logos/decisionserver.svg new file mode 100755 index 0000000000..8df19a6b88 --- /dev/null +++ b/app/images/logos/decisionserver.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/eap.svg b/app/images/logos/eap.svg new file mode 100755 index 0000000000..33b408c7ed --- /dev/null +++ b/app/images/logos/eap.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/processserver.svg b/app/images/logos/processserver.svg new file mode 100755 index 0000000000..93c4732042 --- /dev/null +++ b/app/images/logos/processserver.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/rh-integration.svg b/app/images/logos/rh-integration.svg new file mode 100755 index 0000000000..498aad1b6e --- /dev/null +++ b/app/images/logos/rh-integration.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/rh-tomcat.svg b/app/images/logos/rh-tomcat.svg new file mode 100755 index 0000000000..50d4c33a81 --- /dev/null +++ b/app/images/logos/rh-tomcat.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/images/logos/sso.svg b/app/images/logos/sso.svg new file mode 100755 index 0000000000..644f5bc795 --- /dev/null +++ b/app/images/logos/sso.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/app/scripts/constants.js b/app/scripts/constants.js index 5f04e13266..dfd5a43ece 100644 --- a/app/scripts/constants.js +++ b/app/scripts/constants.js @@ -565,7 +565,9 @@ angular.extend(window.OPENSHIFT_CONSTANTS, { LOGO_BASE_URL: "images/logos/", // Some icon classes we have SVG images for. Use the color images when we have them. LOGOS: { + 'icon-3scale': '3scale.svg', 'icon-aerogear': 'aerogear.svg', + 'icon-amq': 'amq.svg', 'icon-angularjs': 'angularjs.svg', 'icon-ansible': 'ansible.svg', 'icon-apache': 'apache.svg', @@ -574,9 +576,13 @@ angular.extend(window.OPENSHIFT_CONSTANTS, { 'icon-cassandra': 'cassandra.svg', 'icon-clojure': 'clojure.svg', 'icon-codeigniter': 'codeigniter.svg', + 'icon-datagrid': 'datagrid.svg', + 'icon-datavirt': 'datavirt.svg', + 'icon-decisionserver': 'decisionserver.svg', 'icon-django': 'django.svg', 'icon-dotnet': 'dotnet.svg', 'icon-drupal': 'drupal.svg', + 'icon-eap': 'eap.svg', 'icon-elastic': 'elastic.svg', 'icon-erlang': 'erlang.svg', 'icon-git': 'git.svg', @@ -610,14 +616,20 @@ angular.extend(window.OPENSHIFT_CONSTANTS, { 'icon-php': 'php.svg', 'icon-play': 'play.svg', 'icon-postgresql': 'postgresql.svg', + 'icon-processserver': 'processserver.svg', 'icon-python': 'python.svg', 'icon-rabbitmq': 'rabbitmq.svg', 'icon-rails': 'rails.svg', 'icon-redis': 'redis.svg', + 'icon-rh-integration': 'rh-integration.svg', + // Use the upstream icon. + 'icon-rh-openjdk': 'openjdk.svg', + 'icon-rh-tomcat': 'rh-tomcat.svg', 'icon-ruby': 'ruby.svg', 'icon-scala': 'scala.svg', 'icon-shadowman': 'shadowman.svg', 'icon-spring': 'spring.svg', + 'icon-sso': 'sso.svg', 'icon-stackoverflow': 'stackoverflow.svg', 'icon-symfony': 'symfony.svg', 'icon-tomcat': 'tomcat.svg', diff --git a/dist/images/logos/3scale.svg b/dist/images/logos/3scale.svg new file mode 100644 index 0000000000..769b5119f5 --- /dev/null +++ b/dist/images/logos/3scale.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/amq.svg b/dist/images/logos/amq.svg new file mode 100644 index 0000000000..50b7effd72 --- /dev/null +++ b/dist/images/logos/amq.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/datagrid.svg b/dist/images/logos/datagrid.svg new file mode 100644 index 0000000000..77d167a8c0 --- /dev/null +++ b/dist/images/logos/datagrid.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/datavirt.svg b/dist/images/logos/datavirt.svg new file mode 100644 index 0000000000..0c96f06236 --- /dev/null +++ b/dist/images/logos/datavirt.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/decisionserver.svg b/dist/images/logos/decisionserver.svg new file mode 100644 index 0000000000..b86c2d77a3 --- /dev/null +++ b/dist/images/logos/decisionserver.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/eap.svg b/dist/images/logos/eap.svg new file mode 100644 index 0000000000..7dc05b2690 --- /dev/null +++ b/dist/images/logos/eap.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/processserver.svg b/dist/images/logos/processserver.svg new file mode 100644 index 0000000000..f84a1e40fc --- /dev/null +++ b/dist/images/logos/processserver.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/rh-integration.svg b/dist/images/logos/rh-integration.svg new file mode 100644 index 0000000000..fec95587a4 --- /dev/null +++ b/dist/images/logos/rh-integration.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/rh-tomcat.svg b/dist/images/logos/rh-tomcat.svg new file mode 100644 index 0000000000..2b35ca934a --- /dev/null +++ b/dist/images/logos/rh-tomcat.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/images/logos/sso.svg b/dist/images/logos/sso.svg new file mode 100644 index 0000000000..d80c9fa3ad --- /dev/null +++ b/dist/images/logos/sso.svg @@ -0,0 +1 @@ +Logo \ No newline at end of file diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index e263e3f4c9..0bf7724c6c 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -1,6 +1,6 @@ "use strict"; -function OverviewController(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, S, C, w, k, P, j) { +function OverviewController(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, S, C, w, k, j, P) { var R = this, I = t("isIE")(); e.projectName = n.project, R.catalogLandingPageEnabled = !l.DISABLE_SERVICE_CATALOG_LANDING_PAGE; var E, T, N = t("annotation"), D = t("canI"), A = t("buildConfigForBuild"), B = t("deploymentIsInProgress"), L = t("imageObjectRef"), U = t("isJenkinsPipelineStrategy"), O = t("isNewerResource"), F = t("label"), x = t("podTemplate"), V = r.getPreferredVersion("servicebindings"), M = r.getPreferredVersion("clusterserviceclasses"), q = r.getPreferredVersion("serviceinstances"), z = r.getPreferredVersion("clusterserviceplans"), H = {}, G = {}, W = {}, K = R.state = { @@ -66,7 +66,7 @@ return o.groupByApp(e, "metadata.name"); }, ne = function(e) { var t = null; return _.each(e, function(e) { -t = t ? P.getPreferredDisplayRoute(t, e) : e; +t = t ? j.getPreferredDisplayRoute(t, e) : e; }), t; }, ae = _.debounce(function() { e.$evalAsync(function() { @@ -188,19 +188,19 @@ _.each(R.deploymentConfigs, _e); }, ke = function(e) { var t = Y(e); return t ? _.get(R, [ "replicaSetsByDeploymentUID", t ]) : {}; -}, Pe = function(e) { +}, je = function(e) { var t = k.getPausedDeploymentAlerts(e), n = ke(e); _.each(n, function(e) { var n = he(e); _.assign(t, n); }), ve(e, t); -}, je = function() { -_.each(R.deployments, Pe); +}, Pe = function() { +_.each(R.deployments, je); }, Re = function() { be(R.replicationControllers), be(R.replicaSets), be(R.statefulSets), be(R.monopods); }, Ie = _.debounce(function() { e.$evalAsync(function() { -Re(), we(), je(); +Re(), we(), Pe(); }); }, 500), Ee = function(e) { _.isEmpty(e) || (v.addLabelSuggestionsFromResources(e, H), "pipeline" !== R.viewBy && v.setLabelSuggestions(H)); @@ -245,7 +245,7 @@ return Le(e, n); }), r = d.sortByRevision(a); R.replicaSetsByDeploymentUID[t] = r, R.currentByDeploymentUID[t] = _.head(r); } -}), R.vanillaReplicaSets = _.sortBy(R.replicaSetsByDeploymentUID[""], "metadata.name"), je()); +}), R.vanillaReplicaSets = _.sortBy(R.replicaSetsByDeploymentUID[""], "metadata.name"), Pe()); }, Oe = {}, Fe = function(e) { e && K.allServices && _.each(e, function(e) { var t = [], n = Y(e), a = x(e); @@ -262,8 +262,8 @@ var e = [ R.deploymentConfigs, R.vanillaReplicationControllers, R.deployments, R _.each(e, Fe), ae(); } }, Ve = function() { -var e = P.groupByService(R.routes, !0); -K.routesByService = _.mapValues(e, P.sortRoutesByScore), ae(); +var e = j.groupByService(R.routes, !0); +K.routesByService = _.mapValues(e, j.sortRoutesByScore), ae(); }, Me = function() { K.hpaByResource = m.groupHPAs(R.horizontalPodAutoscalers); }, qe = function(e) { @@ -385,7 +385,7 @@ R.pods = e.by("metadata.name"), De(), a(), Ie(), Fe(R.monopods), be(R.monopods), })), at.push(u.watch("replicationcontrollers", n, function(e) { R.replicationControllers = e.by("metadata.name"), Be(), Fe(R.vanillaReplicationControllers), Fe(R.monopods), be(R.vanillaReplicationControllers), Ee(R.vanillaReplicationControllers), tt(), me(), h.log("replicationcontrollers (subscribe)", R.replicationControllers); })), at.push(u.watch("deploymentconfigs", n, function(e) { -R.deploymentConfigs = e.by("metadata.name"), Be(), Fe(R.deploymentConfigs), Fe(R.vanillaReplicationControllers), Ee(R.deploymentConfigs), je(), Ye(), Ze(), tt(), me(), h.log("deploymentconfigs (subscribe)", R.deploymentConfigs); +R.deploymentConfigs = e.by("metadata.name"), Be(), Fe(R.deploymentConfigs), Fe(R.vanillaReplicationControllers), Ee(R.deploymentConfigs), Pe(), Ye(), Ze(), tt(), me(), h.log("deploymentconfigs (subscribe)", R.deploymentConfigs); })), at.push(u.watch({ group: "extensions", resource: "replicasets" @@ -448,14 +448,14 @@ pollInterval: 6e4 })); var r, o, i = {}, s = {}; c.SERVICE_CATALOG_ENABLED && D(q, "watch") && (r = function(e) { -var t = j.getServiceClassNameForInstance(e); +var t = P.getServiceClassNameForInstance(e); _.has(K, [ "serviceClasses", t ]) || i[t] || (i[t] = u.get(M, t, {}).then(function(e) { K.serviceClasses[t] = e; }).finally(function() { delete s[t]; })); }, o = function(e) { -var t = j.getServicePlanNameForInstance(e); +var t = P.getServicePlanNameForInstance(e); _.has(K, [ "servicePlans", t ]) || s[t] || (s[t] = u.get(z, t, {}).then(function(e) { K.servicePlans[t] = e; }).finally(function() { @@ -951,7 +951,9 @@ APP_LAUNCHER_NAVIGATION: [], QUOTA_NOTIFICATION_MESSAGE: {}, LOGO_BASE_URL: "images/logos/", LOGOS: { +"icon-3scale": "3scale.svg", "icon-aerogear": "aerogear.svg", +"icon-amq": "amq.svg", "icon-angularjs": "angularjs.svg", "icon-ansible": "ansible.svg", "icon-apache": "apache.svg", @@ -960,9 +962,13 @@ LOGOS: { "icon-cassandra": "cassandra.svg", "icon-clojure": "clojure.svg", "icon-codeigniter": "codeigniter.svg", +"icon-datagrid": "datagrid.svg", +"icon-datavirt": "datavirt.svg", +"icon-decisionserver": "decisionserver.svg", "icon-django": "django.svg", "icon-dotnet": "dotnet.svg", "icon-drupal": "drupal.svg", +"icon-eap": "eap.svg", "icon-elastic": "elastic.svg", "icon-erlang": "erlang.svg", "icon-git": "git.svg", @@ -996,14 +1002,19 @@ LOGOS: { "icon-php": "php.svg", "icon-play": "play.svg", "icon-postgresql": "postgresql.svg", +"icon-processserver": "processserver.svg", "icon-python": "python.svg", "icon-rabbitmq": "rabbitmq.svg", "icon-rails": "rails.svg", "icon-redis": "redis.svg", +"icon-rh-integration": "rh-integration.svg", +"icon-rh-openjdk": "openjdk.svg", +"icon-rh-tomcat": "rh-tomcat.svg", "icon-ruby": "ruby.svg", "icon-scala": "scala.svg", "icon-shadowman": "shadowman.svg", "icon-spring": "spring.svg", +"icon-sso": "sso.svg", "icon-stackoverflow": "stackoverflow.svg", "icon-symfony": "symfony.svg", "icon-tomcat": "tomcat.svg", @@ -3565,7 +3576,7 @@ target: "_blank" } ] }; } -}, P = function(e, t) { +}, j = function(e, t) { var n = [], a = "Pod" === e.kind ? e : _.get(e, "spec.template"); return a ? (_.each([ "cpu", "memory", "requests.cpu", "requests.memory", "limits.cpu", "limits.memory", "pods" ], function(r) { var o = t.status.total || t.status; @@ -3577,7 +3588,7 @@ s && n.push(s); } } }), n) : n; -}, j = function(t, n, a) { +}, P = function(t, n, a) { var r = []; return t && n ? (_.each(t, function(t) { var o = y(t, n), i = y(t, a), s = e.objectToResourceGroupVersion(t); @@ -3595,7 +3606,7 @@ href: "project/" + e.metadata.namespace + "/quota", label: "View Quota", target: "_blank" } ] -}), r = r.concat(P(t, e)); +}), r = r.concat(j(t, e)); }; _.each(o, p), _.each(i, p); } @@ -3621,8 +3632,8 @@ return { filterQuotasForResource: y, isBestEffortPod: g, isTerminatingPod: v, -getResourceLimitAlerts: P, -getQuotaAlerts: j, +getResourceLimitAlerts: j, +getQuotaAlerts: P, getLatestQuotaAlerts: function(e, t) { var n, a, r = []; return r.push(s.list("resourcequotas", t).then(function(e) { @@ -3631,7 +3642,7 @@ n = e.by("metadata.name"), l.log("quotas", n); a = e.by("metadata.name"), l.log("cluster quotas", a); })), o.all(r).then(function() { return { -quotaAlerts: j(e, n, a) +quotaAlerts: P(e, n, a) }; }); }, @@ -4721,7 +4732,7 @@ name: t.containerName }), a = b(n); t.containerState = a; }); -}, k = t("annotation"), P = function(t, n) { +}, k = t("annotation"), j = function(t, n) { if (e.loaded = !0, e.pod = t, e.dcName = k(t, "deploymentConfig"), e.rcName = k(t, "deployment"), e.deploymentVersion = k(t, "deploymentVersion"), e.logCanRun = !_.includes([ "New", "Pending", "Unknown" ], t.status.phase), g(), delete e.controllerRef, !e.dcName) { var a = u.getControllerReferences(t); e.controllerRef = _.find(a, function(e) { @@ -4737,10 +4748,10 @@ m.get(n.project).then(_.spread(function(a, l) { f = l, e.project = a, e.projectContext = l, i.get("pods", n.pod, l, { errorNotification: !1 }).then(function(t) { -P(t); +j(t); var a = {}; a[t.metadata.name] = t, e.logOptions.container = n.container || t.spec.containers[0].name, e.containerTerminals = S(), C(t), c.fetchReferencedImageStreamImages(a, e.imagesByDockerReference, e.imageStreamImageRefByDockerReference, f), p.push(i.watchObject("pods", n.pod, l, function(t, n) { -P(t, n), w(e.containerTerminals), C(t); +j(t, n), w(e.containerTerminals), C(t); })); }, function(n) { e.loaded = !0, e.alerts.load = { @@ -4916,9 +4927,9 @@ var h, y, b, S; l.isAvailable().then(function(e) { n.metricsAvailable = e; }); -var C = a("orderObjectsByDate"), w = [ "metadata.name" ], k = [], P = function() { +var C = a("orderObjectsByDate"), w = [ "metadata.name" ], k = [], j = function() { n.filteredPods = s.filterForKeywords(S, w, k), n.filteredReplicationControllers = s.filterForKeywords(y, w, k), n.filteredReplicaSets = s.filterForKeywords(b, w, k), n.filteredBuilds = s.filterForKeywords(h, w, k), n.filteredStatefulSets = s.filterForKeywords(_.values(n.statefulSets), w, k); -}, j = function(e) { +}, P = function(e) { n.logOptions.pods[e.metadata.name] = { container: e.spec.containers[0].name }, n.logCanRun.pods[e.metadata.name] = !_.includes([ "New", "Pending", "Unknown" ], e.status.phase); @@ -4994,7 +5005,7 @@ var t = _.get(n, [ "podsByOwnerUID", e.metadata.uid ], []); _.isEmpty(t) || u.toPodsForDeployment(e, t); }, m.get(e.project).then(_.spread(function(e, a) { n.project = e, n.projectContext = a, g.push(o.watch("pods", a, function(e) { -n.podsByName = e.by("metadata.name"), n.pods = C(n.podsByName, !0), n.podsByOwnerUID = d.groupByOwnerUID(n.pods), n.podsLoaded = !0, _.each(n.pods, j), T(), c.log("pods", n.pods); +n.podsByName = e.by("metadata.name"), n.pods = C(n.podsByName, !0), n.podsByOwnerUID = d.groupByOwnerUID(n.pods), n.podsLoaded = !0, _.each(n.pods, P), T(), c.log("pods", n.pods); })), g.push(o.watch({ resource: "statefulsets", group: "apps", @@ -5026,7 +5037,7 @@ e.hideOlderResources = n.filters.hideOlderResources ? "true" : "false", t.replac var e = t.search(); e.kind = n.kindSelector.selected.kind, t.replace().search(e); }), n.$watch("filters.text", _.debounce(function() { -n.filterKeywords = k = s.generateKeywords(n.filters.text), n.$apply(P); +n.filterKeywords = k = s.generateKeywords(n.filters.text), n.$apply(j); }, 50, { maxWait: 250 })), n.$watch("renderOptions.collapseEventsSidebar", function(e, t) { @@ -5077,7 +5088,7 @@ e && !_.includes(a.serviceAccounts, e) ? a.serviceAccounts = [ e ].concat(t) : a } }); }); -}, P = function(e) { +}, j = function(e) { c.list("rolebindings", f, null, { errorNotification: !1 }).then(function(e) { @@ -5089,14 +5100,14 @@ subjectKindsForUI: u.mapRolebindingsForUI(e.by("metadata.name"), b) }, function() { e && (a.roleBindings[e.metadata.name] = e, a.subjectKindsForUI = u.mapRolebindingsForUI(a.roleBindings, b)), w(); }); -}, j = function(t, n) { +}, P = function(t, n) { a.disableAddForm = !0, m.create(t, n, g, f).then(function() { -P(), C("success", S.update.subject.success({ +j(), C("success", S.update.subject.success({ roleName: t.metadata.name, subjectName: n.name })); }, function(a) { -w(), P(), C("error", S.update.subject.error({ +w(), j(), C("error", S.update.subject.error({ roleName: t.metadata.name, subjectName: n.name }), S.errorReason({ @@ -5105,12 +5116,12 @@ httpErr: e("getErrorDetails")(a) }); }, R = function(t, n, r) { a.disableAddForm = !0, m.addSubject(t, n, r, f).then(function() { -P(), C("success", S.update.subject.success({ +j(), C("success", S.update.subject.success({ roleName: t.roleRef.name, subjectName: n.name })); }, function(a) { -w(), P(), C("error", S.update.subject.error({ +w(), j(), C("error", S.update.subject.error({ roleName: t.roleRef.name, subjectName: n.name }), S.errorReason({ @@ -5198,7 +5209,7 @@ e && !_.includes(a.projects, e) ? a.projects = [ e ].concat(t) : a.projects = t; } }); }), l.get(n.project).then(_.spread(function(n, r) { -f = r, P(), k(f), angular.extend(a, { +f = r, j(), k(f), angular.extend(a, { project: n, subjectKinds: E, canUpdateRolebindings: y("rolebindings", "update", g), @@ -5216,7 +5227,7 @@ return l; }).result.then(function() { m.removeSubject(n, i, a.roleBindings, f).then(function(e) { c ? t.url("./") : (s.getProjectRules(g, !0).then(function() { -P(e[0]); +j(e[0]); var t = y("rolebindings", "update", g); angular.extend(a, { canUpdateRolebindings: t, @@ -5252,7 +5263,7 @@ name: n.metadata.name i && _.some(i.subjects, o) ? C("error", S.update.subject.exists({ roleName: n.metadata.name, subjectName: e -})) : i ? R(i, o, r) : j(n, o); +})) : i ? R(i, o, r) : P(n, o); } }), p.listAllRoles(f, { errorNotification: !1 @@ -5265,7 +5276,7 @@ name: e } }); }; -P(), angular.extend(a, { +j(), angular.extend(a, { toggle: { roles: !1 }, @@ -5804,7 +5815,7 @@ namespace: n.project }), e.emptyMessage = "Loading...", e.deploymentConfigsInstantiateVersion = a.getPreferredVersion("deploymentconfigs/instantiate"), e.deploymentConfigsVersion = a.getPreferredVersion("deploymentconfigs"), e.eventsVersion = a.getPreferredVersion("events"), e.horizontalPodAutoscalersVersion = a.getPreferredVersion("horizontalpodautoscalers"); var y = a.getPreferredVersion("builds"), b = a.getPreferredVersion("imagestreams"), S = a.getPreferredVersion("limitranges"), C = a.getPreferredVersion("replicationcontrollers"); e.healthCheckURL = u.healthCheckURL(n.project, "DeploymentConfig", n.deploymentconfig, e.deploymentConfigsVersion.group); -var w = t("mostRecent"), k = t("orderObjectsByDate"), P = []; +var w = t("mostRecent"), k = t("orderObjectsByDate"), j = []; p.get(n.project).then(_.spread(function(a, r) { function u() { g.getLabelSelector().isEmpty() || !$.isEmptyObject(e.deployments) || $.isEmptyObject(e.unfilteredDeployments) ? delete e.alerts.deployments : e.alerts.deployments = { @@ -5821,7 +5832,7 @@ e.hpaWarnings = t; o.get(e.deploymentConfigsVersion, n.deploymentconfig, r, { errorNotification: !1 }).then(function(a) { -e.loaded = !0, e.deploymentConfig = a, e.strategyParams = t("deploymentStrategyParams")(a), p(), P.push(o.watchObject(e.deploymentConfigsVersion, n.deploymentconfig, r, function(t, n) { +e.loaded = !0, e.deploymentConfig = a, e.strategyParams = t("deploymentStrategyParams")(a), p(), j.push(o.watchObject(e.deploymentConfigsVersion, n.deploymentconfig, r, function(t, n) { "DELETED" === n && (e.alerts.deleted = { type: "warning", message: "This deployment configuration has been deleted." @@ -5833,7 +5844,7 @@ type: "error", message: 404 === n.status ? "This deployment configuration can not be found, it may have been deleted." : "The deployment configuration details could not be loaded.", details: 404 === n.status ? "Any remaining deployment history for this deployment will be shown." : t("getErrorDetails")(n) }; -}), P.push(o.watch(C, r, function(a, r, o) { +}), j.push(o.watch(C, r, function(a, r, o) { var s = n.deploymentconfig; if (e.emptyMessage = "No deployments to show", r) { if (i.deploymentBelongsToConfig(o, n.deploymentconfig)) { @@ -5863,12 +5874,12 @@ labelSelector: v("deploymentConfig") + "=" + e.deploymentConfigName } })), o.list(S, r).then(function(e) { d = e.by("metadata.name"), p(); -}), P.push(o.watch(b, r, function(t) { +}), j.push(o.watch(b, r, function(t) { var n = t.by("metadata.name"); c.buildDockerRefMapForImageStreams(n, h), e.deploymentConfig && c.fetchReferencedImageStreamImages([ e.deploymentConfig.spec.template ], e.imagesByDockerReference, h, r), m.log("imagestreams (subscribe)", e.imageStreams); -})), P.push(o.watch(y, r, function(t) { +})), j.push(o.watch(y, r, function(t) { e.builds = t.by("metadata.name"), m.log("builds (subscribe)", e.builds); -})), P.push(o.watch(e.horizontalPodAutoscalersVersion, r, function(t) { +})), j.push(o.watch(e.horizontalPodAutoscalersVersion, r, function(t) { e.autoscalers = s.filterHPA(t.by("metadata.name"), "DeploymentConfig", n.deploymentconfig), p(); })), g.onActiveFiltersChanged(function(t) { e.$apply(function() { @@ -5895,7 +5906,7 @@ details: t("getErrorDetails")(a) }; }); }; -var j = function() { +var P = function() { if (_.get(e, "deploymentConfig.spec.paused")) return !1; var t = _.get(e, "deploymentConfig.spec.triggers", []); return _.some(t, { @@ -5904,7 +5915,7 @@ type: "ConfigChange" }; e.removeVolume = function(t) { var n; -n = j() ? "This will remove the volume from the deployment config and trigger a new deployment." : "This will remove the volume from the deployment config.", t.persistentVolumeClaim ? n += " It will not delete the persistent volume claim." : t.secret ? n += " It will not delete the secret." : t.configMap && (n += " It will not delete the config map."); +n = P() ? "This will remove the volume from the deployment config and trigger a new deployment." : "This will remove the volume from the deployment config.", t.persistentVolumeClaim ? n += " It will not delete the persistent volume claim." : t.secret ? n += " It will not delete the secret." : t.configMap && (n += " It will not delete the config map."); l.confirm({ message: "Remove volume " + t.name + "?", details: n, @@ -5915,7 +5926,7 @@ cancelButtonText: "Cancel" f.removeVolume(e.deploymentConfig, t, r); }); }, e.$on("$destroy", function() { -o.unwatchAll(P); +o.unwatchAll(j); }); })); } ]), angular.module("openshiftConsole").controller("ReplicaSetController", [ "$scope", "$filter", "$routeParams", "AuthorizationService", "BreadcrumbsService", "DataService", "DeploymentsService", "HPAService", "ImageStreamResolver", "Logger", "MetricsService", "ModalsService", "Navigate", "OwnerReferencesService", "PodsService", "ProjectsService", "StorageService", "keyValueEditorUtils", "kind", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y) { @@ -5933,12 +5944,12 @@ e.resource = "replicationcontrollers", e.healthCheckURL = m.healthCheckURL(n.pro } var k = {}; e.projectName = n.project, e.kind = y, e.replicaSet = null, e.deploymentConfig = null, e.deploymentConfigMissing = !1, e.imagesByDockerReference = {}, e.builds = {}, e.alerts = {}, e.renderOptions = e.renderOptions || {}, e.renderOptions.hideFilterWidget = !0, e.forms = {}, e.logOptions = {}; -var P = []; +var j = []; u.isAvailable().then(function(t) { e.metricsAvailable = t; }); -var j = t("deploymentStatus"), R = function(t) { -e.logCanRun = !_.includes([ "New", "Pending" ], j(t)); +var P = t("deploymentStatus"), R = function(t) { +e.logCanRun = !_.includes([ "New", "Pending" ], P(t)); }, I = t("isIE")(); g.get(n.project).then(_.spread(function(u, g) { e.project = u, e.projectContext = g; @@ -5951,7 +5962,7 @@ var a = s.filterHPA(h, "Deployment", e.deployment.metadata.name); e.autoscalers = e.hpaForRS.concat(a); } else e.autoscalers = e.hpaForRS; }, T = function() { -P.push(o.watch(e.resource, g, function(t) { +j.push(o.watch(e.resource, g, function(t) { var n, a = []; angular.forEach(t.by("metadata.name"), function(t) { (S(t, "deploymentConfig") || "") === e.deploymentConfigName && a.push(t); @@ -5997,7 +6008,7 @@ a && o.get({ group: "apps", resource: "deployments" }, a.name, g).then(function(t) { -e.deployment = t, e.healthCheckURL = m.healthCheckURL(n.project, "Deployment", t.metadata.name, "apps"), P.push(o.watchObject({ +e.deployment = t, e.healthCheckURL = m.healthCheckURL(n.project, "Deployment", t.metadata.name, "apps"), j.push(o.watchObject({ group: "apps", resource: "deployments" }, t.metadata.name, g, function(t, a) { @@ -6014,7 +6025,7 @@ link: m.resourceURL(e.deployment) }, humanizedKind: "Deployments" }), A(), E(); -})), P.push(o.watch({ +})), j.push(o.watch({ group: "extensions", resource: "replicasets" }, g, function(e) { @@ -6041,12 +6052,12 @@ L(); } N(), e.breadcrumbs = r.getBreadcrumbs({ object: t -}), P.push(o.watchObject(e.resource, n.replicaSet, g, function(t, n) { +}), j.push(o.watchObject(e.resource, n.replicaSet, g, function(t, n) { "DELETED" === n && (e.alerts.deleted = { type: "warning", message: "This " + C + " has been deleted." }), e.replicaSet = t, R(t), N(), U(), e.deployment && A(); -})), e.deploymentConfigName && T(), P.push(o.watch("pods", g, function(t) { +})), e.deploymentConfigName && T(), j.push(o.watch("pods", g, function(t) { var n = t.by("metadata.name"); e.podsForDeployment = f.filterForOwner(n, e.replicaSet); })); @@ -6060,18 +6071,18 @@ name: n.replicaSet, kind: y, namespace: n.project }); -}), P.push(o.watch(e.resource, g, function(n, a, r) { +}), j.push(o.watch(e.resource, g, function(n, a, r) { e.replicaSets = n.by("metadata.name"), "ReplicationController" === y && (e.deploymentsByDeploymentConfig = i.associateDeploymentsToDeploymentConfig(e.replicaSets)); var o, s; r && (o = S(r, "deploymentConfig"), s = r.metadata.name), e.deploymentConfigDeploymentsInProgress = e.deploymentConfigDeploymentsInProgress || {}, a ? "ADDED" === a || "MODIFIED" === a && t("deploymentIsInProgress")(r) ? (e.deploymentConfigDeploymentsInProgress[o] = e.deploymentConfigDeploymentsInProgress[o] || {}, e.deploymentConfigDeploymentsInProgress[o][s] = r) : "MODIFIED" === a && e.deploymentConfigDeploymentsInProgress[o] && delete e.deploymentConfigDeploymentsInProgress[o][s] : e.deploymentConfigDeploymentsInProgress = i.associateRunningDeploymentToDeploymentConfig(e.deploymentsByDeploymentConfig), r ? "DELETED" !== a && (r.causes = t("deploymentCauses")(r)) : angular.forEach(e.replicaSets, function(e) { e.causes = t("deploymentCauses")(e); }); -})), P.push(o.watch("imagestreams", g, function(e) { +})), j.push(o.watch("imagestreams", g, function(e) { var t = e.by("metadata.name"); c.buildDockerRefMapForImageStreams(t, k), U(), l.log("imagestreams (subscribe)", t); -})), P.push(o.watch("builds", g, function(t) { +})), j.push(o.watch("builds", g, function(t) { e.builds = t.by("metadata.name"), l.log("builds (subscribe)", e.builds); -})), P.push(o.watch({ +})), j.push(o.watch({ group: "autoscaling", resource: "horizontalpodautoscalers", version: "v1" @@ -6083,12 +6094,12 @@ pollInterval: 6e4 })), o.list("limitranges", g).then(function(t) { e.limitRanges = t.by("metadata.name"), N(); }); -P.push(o.watch("resourcequotas", g, function(t) { +j.push(o.watch("resourcequotas", g, function(t) { e.quotas = t.by("metadata.name"); }, { poll: !0, pollInterval: 6e4 -})), P.push(o.watch("appliedclusterresourcequotas", g, function(t) { +})), j.push(o.watch("appliedclusterresourcequotas", g, function(t) { e.clusterQuotas = t.by("metadata.name"); }, { poll: !0, @@ -6096,7 +6107,7 @@ pollInterval: 6e4 })); var O = t("deploymentIsLatest"); e.showRollbackAction = function() { -return "Complete" === j(e.replicaSet) && !O(e.replicaSet, e.deploymentConfig) && !e.replicaSet.metadata.deletionTimestamp && a.canI("deploymentconfigrollbacks", "create"); +return "Complete" === P(e.replicaSet) && !O(e.replicaSet, e.deploymentConfig) && !e.replicaSet.metadata.deletionTimestamp && a.canI("deploymentconfigrollbacks", "create"); }, e.retryFailedDeployment = function(t) { i.retryFailedDeployment(t, g, e); }, e.rollbackToDeployment = function(t, n, a, r) { @@ -6129,7 +6140,7 @@ cancelButtonText: "Cancel" v.removeVolume(e.replicaSet, n, g); }); }, e.$on("$destroy", function() { -o.unwatchAll(P); +o.unwatchAll(j); }); })); } ]), angular.module("openshiftConsole").controller("StatefulSetsController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "LabelFilter", "PodsService", function(e, t, n, a, r, o) { @@ -6965,7 +6976,7 @@ return _.map(e, "metadata.name"); }); e.secrets.secretsByType = _.each(a, function(e) { e.unshift(""); -}), P(); +}), j(); }); var n = function(e, n) { e.type = n && n.kind ? n.kind : "None"; @@ -7115,7 +7126,7 @@ var t = [].concat(e.triggers.githubWebhooks, e.triggers.gitlabWebhooks, e.trigge return t = _.filter(t, function(e) { return _.has(e, "disabled") && !e.disabled || e.present; }), t = _.map(t, "data"); -}, P = function() { +}, j = function() { switch (e.secrets.picked = { gitSecret: e.buildConfig.spec.source.sourceSecret ? [ e.buildConfig.spec.source.sourceSecret ] : [ { name: "" @@ -7145,7 +7156,7 @@ name: "" mountPath: "" } ]; } -}, j = function(e, t, n) { +}, P = function(e, t, n) { t.name ? e[n] = t : delete e[n]; }, R = function(t, n) { var a = "Custom" === e.strategyType ? "secretSource" : "secret", r = _.filter(n, function(e) { @@ -7180,7 +7191,7 @@ break; case "JenkinsPipeline": "path" === e.jenkinsfileOptions.type ? delete e.updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile : delete e.updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath; } -switch (e.sources.images && !_.isEmpty(e.sourceImages) && (e.updatedBuildConfig.spec.source.images[0].paths = C(e.imageSourcePaths), e.updatedBuildConfig.spec.source.images[0].from = w(e.imageOptions.fromSource)), "None" === e.imageOptions.from.type ? delete h(e.updatedBuildConfig).from : h(e.updatedBuildConfig).from = w(e.imageOptions.from), "None" === e.imageOptions.to.type ? delete e.updatedBuildConfig.spec.output.to : e.updatedBuildConfig.spec.output.to = w(e.imageOptions.to), h(e.updatedBuildConfig).env = p.compactEntries(e.envVars), j(e.updatedBuildConfig.spec.source, _.head(e.secrets.picked.gitSecret), "sourceSecret"), j(h(e.updatedBuildConfig), _.head(e.secrets.picked.pullSecret), "pullSecret"), j(e.updatedBuildConfig.spec.output, _.head(e.secrets.picked.pushSecret), "pushSecret"), e.strategyType) { +switch (e.sources.images && !_.isEmpty(e.sourceImages) && (e.updatedBuildConfig.spec.source.images[0].paths = C(e.imageSourcePaths), e.updatedBuildConfig.spec.source.images[0].from = w(e.imageOptions.fromSource)), "None" === e.imageOptions.from.type ? delete h(e.updatedBuildConfig).from : h(e.updatedBuildConfig).from = w(e.imageOptions.from), "None" === e.imageOptions.to.type ? delete e.updatedBuildConfig.spec.output.to : e.updatedBuildConfig.spec.output.to = w(e.imageOptions.to), h(e.updatedBuildConfig).env = p.compactEntries(e.envVars), P(e.updatedBuildConfig.spec.source, _.head(e.secrets.picked.gitSecret), "sourceSecret"), P(h(e.updatedBuildConfig), _.head(e.secrets.picked.pullSecret), "pullSecret"), P(e.updatedBuildConfig.spec.output, _.head(e.secrets.picked.pushSecret), "pushSecret"), e.strategyType) { case "Source": case "Docker": R(e.updatedBuildConfig.spec.source, e.secrets.picked.sourceSecrets); @@ -7402,7 +7413,7 @@ command: [], environment: [] }), e.strategyParamsPropertyName = t; }; -var P = function(e, t, n, a) { +var j = function(e, t, n, a) { var r = { kind: "ImageStreamTag", namespace: t.namespace, @@ -7416,12 +7427,12 @@ containerNames: [ e ], from: r } }, n; -}, j = function() { +}, P = function() { var t = _.reject(e.updatedDeploymentConfig.spec.triggers, function(e) { return "ImageChange" === e.type || "ConfigChange" === e.type; }); return _.each(e.containerConfigByName, function(n, a) { -n.hasDeploymentTrigger ? t.push(P(a, n.triggerData.istag, n.triggerData.data, n.triggerData.automatic)) : _.find(e.updatedDeploymentConfig.spec.template.spec.containers, { +n.hasDeploymentTrigger ? t.push(j(a, n.triggerData.istag, n.triggerData.data, n.triggerData.automatic)) : _.find(e.updatedDeploymentConfig.spec.template.spec.containers, { name: a }).image = n.image; }), e.triggers.hasConfigTrigger && t.push({ @@ -7443,7 +7454,7 @@ var o = e.strategyData[e.strategyParamsPropertyName].maxUnavailable, i = Number( } "Custom" !== e.strategyData.type && _.each([ "pre", "mid", "post" ], function(t) { _.has(e.strategyData, [ e.strategyParamsPropertyName, t, "execNewPod", "env" ]) && (e.strategyData[e.strategyParamsPropertyName][t].execNewPod.env = f.compactEntries(e.strategyData[e.strategyParamsPropertyName][t].execNewPod.env)); -}), _.has(e, "strategyData.customParams.environment") && (e.strategyData.customParams.environment = f.compactEntries(e.strategyData.customParams.environment)), e.updatedDeploymentConfig.spec.template.spec.imagePullSecrets = _.filter(e.secrets.pullSecrets, "name"), e.updatedDeploymentConfig.spec.strategy = e.strategyData, e.updatedDeploymentConfig.spec.triggers = j(), R(), c.update("deploymentconfigs", e.updatedDeploymentConfig.metadata.name, e.updatedDeploymentConfig, e.context).then(function() { +}), _.has(e, "strategyData.customParams.environment") && (e.strategyData.customParams.environment = f.compactEntries(e.strategyData.customParams.environment)), e.updatedDeploymentConfig.spec.template.spec.imagePullSecrets = _.filter(e.secrets.pullSecrets, "name"), e.updatedDeploymentConfig.spec.strategy = e.strategyData, e.updatedDeploymentConfig.spec.triggers = P(), R(), c.update("deploymentconfigs", e.updatedDeploymentConfig.metadata.name, e.updatedDeploymentConfig, e.context).then(function() { d.addNotification({ type: "success", message: "Deployment config " + e.updatedDeploymentConfig.metadata.name + " was successfully updated." @@ -7847,11 +7858,11 @@ e.projectTemplates = t.by("metadata.name"); }))) : l.toErrorPage("Catalog category " + r.category + "/" + r.subcategory + " not found."); } else l.toErrorPage("Catalog category " + r.category + " not found."); } ]), angular.module("openshiftConsole").controller("CreateFromImageController", [ "$scope", "$filter", "$parse", "$q", "$routeParams", "$uibModal", "APIService", "ApplicationGenerator", "DataService", "HPAService", "ImagesService", "LimitRangesService", "Logger", "MetricsService", "Navigate", "NotificationsService", "ProjectsService", "QuotaService", "SOURCE_URL_PATTERN", "SecretsService", "TaskList", "failureObjectNameFilter", "keyValueEditorUtils", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, S, C, w) { -var k = t("displayName"), P = t("humanize"); +var k = t("displayName"), j = t("humanize"); e.projectName = r.project, e.sourceURLPattern = y; -var j = r.imageStream; -if (j) if (r.imageTag) { -var R = r.displayName || j; +var P = r.imageStream; +if (P) if (r.imageTag) { +var R = r.displayName || P; e.displayName = r.displayName, e.advancedOptions = "true" === r.advanced, e.breadcrumbs = [ { title: "Add to Project", link: "project/" + e.projectName + "/create" @@ -7887,7 +7898,7 @@ y = e.by("metadata.name"), m.log("cluster quotas", y); }), e.$watch("scaling.autoscale", C), e.$watch("container", C, !0), e.$watch("name", function(e, t) { I.value && I.value !== t || (I.value = e); }), function(a) { -a.name = r.name, a.imageName = j, a.imageTag = r.imageTag, a.namespace = r.namespace, a.buildConfig = { +a.name = r.name, a.imageName = P, a.imageTag = r.imageTag, a.namespace = r.namespace, a.buildConfig = { buildOnSourceChange: !0, buildOnImageChange: !0, buildOnConfigChange: !0, @@ -7994,13 +8005,13 @@ message: "All resources for application " + e.name + " were created successfully }) : (r = !0, n.failure.forEach(function(e) { a.push({ type: "error", -message: "Cannot create " + P(e.object.kind).toLowerCase() + ' "' + e.object.metadata.name + '". ', +message: "Cannot create " + j(e.object.kind).toLowerCase() + ' "' + e.object.metadata.name + '". ', details: e.data.message }); }), n.success.forEach(function(e) { a.push({ type: "success", -message: "Created " + P(e.kind).toLowerCase() + ' "' + e.metadata.name + '" successfully. ' +message: "Created " + j(e.kind).toLowerCase() + ' "' + e.metadata.name + '" successfully. ' }); })), t.resolve({ alerts: a, @@ -8541,11 +8552,11 @@ a.history.back(); n.cancel = w; var k = function(e) { return n.attach.allContainers || n.attach.containers[e.name]; -}, P = function() { +}, j = function() { var e = _.get(n, "attach.resource.spec.template"); n.existingMountPaths = m.getMountPaths(e, k); }; -n.$watchGroup([ "attach.resource", "attach.allContainers" ], P), n.$watch("attach.containers", P, !0); +n.$watchGroup([ "attach.resource", "attach.allContainers" ], j), n.$watch("attach.containers", j, !0); s.get(v, t.name, d).then(function(e) { n.attach.resource = e, n.breadcrumbs = i.getBreadcrumbs({ object: e, @@ -9525,7 +9536,7 @@ _.isEmpty(p.createResources) ? (t = _.head(p.updateResources), i.update(r.kindTo namespace: p.input.selectedProject.metadata.name }).then(function() { if (!p.isDialog) { -var e = j(t.kind); +var e = P(t.kind); c.addNotification({ type: "success", message: _.capitalize(e) + " " + t.metadata.name + " was successfully updated." @@ -9536,14 +9547,14 @@ b(); c.addNotification({ id: "from-file-error", type: "error", -message: "Unable to update the " + j(t.kind) + " '" + t.metadata.name + "'.", +message: "Unable to update the " + P(t.kind) + " '" + t.metadata.name + "'.", details: e("getErrorDetails")(n) }); })) : (t = _.head(p.createResources), i.create(r.kindToResource(t.kind), null, t, { namespace: p.input.selectedProject.metadata.name }).then(function() { if (!p.isDialog) { -var e = j(t.kind); +var e = P(t.kind); c.addNotification({ type: "success", message: _.capitalize(e) + " " + t.metadata.name + " was successfully created." @@ -9554,7 +9565,7 @@ b(); c.addNotification({ id: "from-file-error", type: "error", -message: "Unable to create the " + j(t.kind) + " '" + t.metadata.name + "'.", +message: "Unable to create the " + P(t.kind) + " '" + t.metadata.name + "'.", details: e("getErrorDetails")(n) }); })); @@ -9574,17 +9585,17 @@ var n = [], a = !1; if (t.failure.length > 0) a = !0, p.errorOccurred = !0, t.failure.forEach(function(e) { n.push({ type: "error", -message: "Cannot create " + j(e.object.kind) + ' "' + e.object.metadata.name + '". ', +message: "Cannot create " + P(e.object.kind) + ' "' + e.object.metadata.name + '". ', details: e.data.message }); }), t.success.forEach(function(e) { n.push({ type: "success", -message: "Created " + j(e.kind) + ' "' + e.metadata.name + '" successfully. ' +message: "Created " + P(e.kind) + ' "' + e.metadata.name + '" successfully. ' }); }); else { var r; -r = p.isList ? "All items in list were created successfully." : j(p.resourceKind) + " " + p.resourceName + " was successfully created.", n.push({ +r = p.isList ? "All items in list were created successfully." : P(p.resourceKind) + " " + p.resourceName + " was successfully created.", n.push({ type: "success", message: r }); @@ -9611,17 +9622,17 @@ var n = [], a = !1; if (t.failure.length > 0) a = !0, p.errorOccurred = !0, t.failure.forEach(function(e) { n.push({ type: "error", -message: "Cannot update " + j(e.object.kind) + ' "' + e.object.metadata.name + '". ', +message: "Cannot update " + P(e.object.kind) + ' "' + e.object.metadata.name + '". ', details: e.data.message }); }), t.success.forEach(function(e) { n.push({ type: "success", -message: "Updated " + j(e.kind) + ' "' + e.metadata.name + '" successfully. ' +message: "Updated " + P(e.kind) + ' "' + e.metadata.name + '" successfully. ' }); }); else { var r; -r = p.isList ? "All items in list were updated successfully." : j(p.resourceKind) + " " + p.resourceName + " was successfully updated.", n.push({ +r = p.isList ? "All items in list were updated successfully." : P(p.resourceKind) + " " + p.resourceName + " was successfully updated.", n.push({ type: "success", message: r }); @@ -9642,11 +9653,11 @@ alerts: n }), e.promise; }); } -var P, j = e("humanizeKind"), R = e("getErrorDetails"); +var j, P = e("humanizeKind"), R = e("getErrorDetails"); d.clear(), p.input = { selectedProject: p.project }, p.aceLoaded = function(e) { -(P = e.getSession()).setOption("tabSize", 2), P.setOption("useSoftTabs", !0), e.setDragDelay = 0, e.$blockScrolling = 1 / 0; +(j = e.getSession()).setOption("tabSize", 2), j.setOption("useSoftTabs", !0), e.setDragDelay = 0, e.$blockScrolling = 1 / 0; }; var I = function(e) { a.open({ @@ -11472,7 +11483,7 @@ links: [ { href: "", label: "Retry", onClick: function() { -delete m.alerts[t], U = 1, j(); +delete m.alerts[t], U = 1, P(); } } ] }; @@ -11486,12 +11497,12 @@ t.total = p(t.id), t.total && (m.hasLimits = !0); var a = _.get(n, "usage.value"); isNaN(a) && (a = 0), e.convert && (a = e.convert(a)), t.used = d3.round(a, e.usagePrecision), t.total && (t.available = d3.round(t.total - a, e.usagePrecision)), e.totalUsed += t.used; } -function P(e, t) { +function j(e, t) { m.noData = !1; var n = _.initial(t.data); e.data ? e.data = _.chain(e.data).takeRight(D).concat(n).value() : e.data = n; } -function j() { +function P() { if (w()) { var e = v(), t = []; angular.forEach(m.metrics, function(n) { @@ -11506,7 +11517,7 @@ k(n, r, e); } }), t = t.concat(a), r.all(a).then(function(e) { A || angular.forEach(e, function(e) { -e && P(_.find(n.datasets, { +e && j(_.find(n.datasets, { id: e.metricID }), e); }); @@ -11610,8 +11621,8 @@ _.each(m.metrics, function(e) { _.each(e.datasets, function(e) { delete e.data; }); -}), delete m.metricsError, j(); -}, !0), R = t(j, c.getDefaultUpdateInterval(), !1); +}), delete m.metricsError, P(); +}, !0), R = t(P, c.getDefaultUpdateInterval(), !1); }); var O = o.$on("metrics.charts.resize", function() { c.redraw(I), c.redraw(E); @@ -11652,7 +11663,7 @@ count: 0 return _.each(R[e.descriptor], function(e) { _.each(e, function(e) { var t = s(e); -(!P || P < e.end) && (P = e.end), n(e) || (t.total += e.value, t.count = t.count + 1); +(!j || j < e.end) && (j = e.end), n(e) || (t.total += e.value, t.count = t.count + 1); }); }), _.each(a, function(t, n) { var a; @@ -11671,7 +11682,7 @@ var a = t + "-dates"; _.set(i, [ "xs", t ], a); var s = [ a ], c = [ t ]; o.push(s), o.push(c), _.each(R[r.descriptor][t], function(e) { -if (s.push(e.start), (!P || P < e.end) && (P = e.end), n(e)) c.push(e.value); else { +if (s.push(e.start), (!j || j < e.end) && (j = e.end), n(e)) c.push(e.value); else { var t = r.convert ? r.convert(e.value) : e.value; c.push(t); } @@ -11703,7 +11714,7 @@ pods: t.pods, namespace: e.metadata.namespace, bucketDuration: p() }; -return w || (n.containerName = t.options.selectedContainer.name), n.start = P || d(), n; +return w || (n.containerName = t.options.selectedContainer.name), n.start = j || d(), n; } } function g(e) { @@ -11738,7 +11749,7 @@ _.set(R, [ e, n ], i); } function y() { if (!I && v()) { -j = Date.now(); +P = Date.now(); var e = f(); c.getPodMetrics(e).then(u, g).finally(function() { t.loaded = !0; @@ -11747,7 +11758,7 @@ t.loaded = !0; } var b, S = {}, C = 30, w = "compact" === t.profile, k = !1; t.uniqueID = s.uniqueID(); -var P, j, R = {}, I = w, E = function(e) { +var j, P, R = {}, I = w, E = function(e) { return e >= 1024; }; t.metrics = [ { @@ -11818,9 +11829,9 @@ var n = s.getDefaultSparklineConfig(e.chartID, e.units, w); return _.set(n, "legend.show", !w && !t.showAverage), n; }; t.$watch("options", function() { -R = {}, P = null, delete t.metricsError, y(); +R = {}, j = null, delete t.metricsError, y(); }, !0), b = e(y, s.getDefaultUpdateInterval(), !1), t.updateInView = function(e) { -I = !e, e && (!j || Date.now() > j + s.getDefaultUpdateInterval()) && y(); +I = !e, e && (!P || Date.now() > P + s.getDefaultUpdateInterval()) && y(); }; var A = r.$on("metrics.charts.resize", function() { s.redraw(S); @@ -11878,10 +11889,10 @@ offset: { top: t.followAffixTop || 0 } }); -}, P = function() { +}, j = function() { return $("#" + t.logViewerID + " .log-view-output"); -}, j = function(e) { -var n = P(), a = n.offset().top; +}, P = function(e) { +var n = j(), a = n.offset().top; if (!(a < 0)) { var r = $(".ellipsis-pulser").outerHeight(!0), o = t.fixedHeight ? t.fixedHeight : Math.floor($(window).height() - a - r); t.chromeless || t.fixedHeight || (o -= 40), e ? n.animate({ @@ -11896,11 +11907,11 @@ t.sized = !0; }); }, n = 0; y = setInterval(function() { -n > 10 ? e() : (n++, P().is(":visible") && (j(), e())); +n > 10 ? e() : (n++, j().is(":visible") && (P(), e())); }, 100); } }, I = _.debounce(function() { -j(!0), b(), C(); +P(!0), b(), C(); }, 100); m.on("resize", I); var E, T = function() { @@ -13077,7 +13088,7 @@ cancelButtonText: "Cancel" i.hideNotification("process-template-error"), _.each(w, function(e) { !e.id || "error" !== e.type && "warning" !== e.type || i.hideNotification(e.id); }); -}, P = function(e) { +}, j = function(e) { k(), w = u.getSecurityAlerts(b, v.selectedProject.metadata.name); var t = e.quotaAlerts || []; w = w.concat(t), _.filter(w, { @@ -13085,17 +13096,17 @@ type: "error" }).length ? (v.disableInputs = !1, _.each(w, function(e) { e.id = _.uniqueId("process-template-alert-"), i.addNotification(e); })) : w.length ? (C(w), v.disableInputs = !1) : S(); -}, j = function() { +}, P = function() { if (_.has(v.selectedProject, "metadata.uid")) return t.when(v.selectedProject); var n = v.selectedProject.metadata.name, a = v.selectedProject.metadata.annotations["new-display-name"], r = e("description")(v.selectedProject); return c.create(n, a, r); }; v.createFromTemplate = function() { -v.disableInputs = !0, j().then(function(e) { +v.disableInputs = !0, P().then(function(e) { v.selectedProject = e, g = { namespace: v.selectedProject.metadata.name }, v.template.labels = m.mapEntries(m.compactEntries(v.labels)), r.create("processedtemplates", null, v.template, g).then(function(e) { -s.setTemplateData(e.parameters, v.template.parameters, e.message), b = e.objects, l.getLatestQuotaAlerts(b, g).then(P); +s.setTemplateData(e.parameters, v.template.parameters, e.message), b = e.objects, l.getLatestQuotaAlerts(b, g).then(j); }, function(e) { v.disableInputs = !1; var t; @@ -14040,15 +14051,15 @@ details: g(e) } } else n.mode = "istag"; }); -var P, j = e("displayName"), R = function() { +var j, P = e("displayName"), R = function() { var e = { -started: "Deploying image " + n.app.name + " to project " + j(n.input.selectedProject), -success: "Deployed image " + n.app.name + " to project " + j(n.input.selectedProject), -failure: "Failed to deploy image " + n.app.name + " to project " + j(n.input.selectedProject) +started: "Deploying image " + n.app.name + " to project " + P(n.input.selectedProject), +success: "Deployed image " + n.app.name + " to project " + P(n.input.selectedProject), +failure: "Failed to deploy image " + n.app.name + " to project " + P(n.input.selectedProject) }; d.clear(), d.add(e, {}, n.input.selectedProject.metadata.name, function() { var e = t.defer(); -return o.batch(P, { +return o.batch(j, { namespace: n.input.selectedProject.metadata.name }).then(function(t) { var a, r = !_.isEmpty(t.failure); @@ -14103,8 +14114,8 @@ e.id = _.uniqueId("deploy-image-alert-"), c.addNotification(e); }; n.create = function() { n.disableInputs = !0, h(), y().then(function(e) { -n.input.selectedProject = e, P = m(); -var t = r.ifResourcesDontExist(P, n.input.selectedProject.metadata.name), a = u.getLatestQuotaAlerts(P, { +n.input.selectedProject = e, j = m(); +var t = r.ifResourcesDontExist(j, n.input.selectedProject.metadata.name), a = u.getLatestQuotaAlerts(j, { namespace: n.input.selectedProject.metadata.name }), o = function(e) { return n.nameTaken = e.nameTaken, a; @@ -14563,14 +14574,14 @@ return _.filter(e, "unread"); _.each(p.notificationGroups, function(e) { e.totalUnread = w(e.notifications).length, e.hasUnread = !!e.totalUnread, o.$emit("NotificationDrawerWrapper.onUnreadNotifications", e.totalUnread); }); -}, P = function(e) { +}, j = function(e) { _.each(p.notificationGroups, function(t) { _.remove(t.notifications, { uid: e.uid, namespace: e.namespace }); }), delete v[r.project][e.uid]; -}, j = function(e) { +}, P = function(e) { return _.map(e, function(e) { return { actions: null, @@ -14605,7 +14616,7 @@ u && (s.unwatch(u), u = null); }, A = function() { l && l(), l = null; }, $ = function(e) { -g[r.project] = j(R(e.by("metadata.name"))), T(); +g[r.project] = P(R(e.by("metadata.name"))), T(); }, B = function(e, t) { var n = t.namespace || r.project, a = t.id ? n + "/" + t.id : _.uniqueId("notification_") + Date.now(); t.showInDrawer && !c.isCleared(a) && (v[n] = v[n] || {}, v[n][a] = { @@ -14682,7 +14693,7 @@ p.drawerHidden = !p.drawerHidden; })), f.push(o.$on("NotificationDrawerWrapper.hide", function() { p.drawerHidden = !0; })), f.push(o.$on("NotificationDrawerWrapper.clear", function(e, t) { -c.markCleared(t.uid), P(t), p.countUnreadNotifications(); +c.markCleared(t.uid), j(t), p.countUnreadNotifications(); })); }; p.$onInit = function() {