Skip to content

Commit 4be3793

Browse files
author
OpenShift Bot
authored
Merge pull request #1992 from spadgett/common-0.0.51
Merged by openshift-bot
2 parents 74e3a08 + 80a3a9c commit 4be3793

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"angular-moment": "1.0.0",
4747
"angular-utf8-base64": "0.0.5",
4848
"file-saver": "1.3.3",
49-
"origin-web-common": "0.0.50",
49+
"origin-web-common": "0.0.51",
5050
"origin-web-catalog": "0.0.41"
5151
},
5252
"devDependencies": {

dist/scripts/vendor.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -73751,9 +73751,9 @@ return _.some(e.resources, function(t) {
7375173751
return d(t) && !_.isEmpty(_.intersection(e.verbs, [ "*", "create", "update" ]));
7375273752
});
7375373753
});
73754-
}, f = function(e) {
73754+
}, f = {}, p = function(e) {
7375573755
return _.get(s.get(e || a), [ "rules" ]);
73756-
}, p = function(e, t, n, i) {
73756+
}, g = function(e, t, n, i) {
7375773757
var r = e[n];
7375873758
if (!r) return !1;
7375973759
var o = r[i];
@@ -73766,12 +73766,13 @@ var c = e.defer();
7376673766
a = t;
7376773767
var d = s.get(t);
7376873768
if (!d || d.forceRefresh || i) if (r.apiInfo("selfsubjectrulesreviews")) {
73769-
n.log("AuthorizationService, loading user rules for " + t + " project");
73770-
var f = {
73769+
if (f[t]) return f[t];
73770+
n.log("AuthorizationService, loading user rules for " + t + " project"), f[t] = c.promise;
73771+
var p = {
7377173772
kind: "SelfSubjectRulesReview",
7377273773
apiVersion: "v1"
7377373774
};
73774-
o.create("selfsubjectrulesreviews", null, f, {
73775+
o.create("selfsubjectrulesreviews", null, p, {
7377573776
namespace: t
7377673777
}).then(function(e) {
7377773778
var n = u(e.status.rules), i = h(e.status.rules);
@@ -73783,19 +73784,21 @@ cacheTimestamp: _.now()
7378373784
}), c.resolve();
7378473785
}, function() {
7378573786
l = !0, c.resolve();
73787+
}).finally(function() {
73788+
delete f[t];
7378673789
});
7378773790
} else n.log("AuthorizationService, resource 'selfsubjectrulesreviews' is not part of APIserver. Switching into permissive mode."), l = !0, c.resolve(); else n.log("AuthorizationService, using cached rules for " + t + " project"), _.now() - d.cacheTimestamp >= 6e5 && (d.forceRefresh = !0), c.resolve();
7378873791
return c.promise;
7378973792
},
7379073793
canI: function(e, t, n) {
7379173794
if (l) return !0;
73792-
var i = r.toResourceGroupVersion(e), o = f(n || a);
73793-
return !!o && (p(o, t, i.group, i.resource) || p(o, t, "*", "*") || p(o, t, i.group, "*") || p(o, t, "*", i.resource));
73795+
var i = r.toResourceGroupVersion(e), o = p(n || a);
73796+
return !!o && (g(o, t, i.group, i.resource) || g(o, t, "*", "*") || g(o, t, i.group, "*") || g(o, t, "*", i.resource));
7379473797
},
7379573798
canIAddToProject: function(e) {
7379673799
return !!l || !!_.get(s.get(e || a), [ "canAddToProject" ]);
7379773800
},
73798-
getRulesForProject: f
73801+
getRulesForProject: p
7379973802
};
7380073803
} ]), angular.module("openshiftCommonServices").factory("base64util", function() {
7380173804
return {
@@ -73884,6 +73887,7 @@ return i.create(o, null, r, a);
7388473887
isServiceBindable: d,
7388573888
getPodPresetSelectorsForBindings: h,
7388673889
getBindingsForResource: function(e, t) {
73890+
if ("Instance" === _.get(t, "kind")) return _.filter(e, [ "spec.instanceRef.name", _.get(t, "metadata.name") ]);
7388773891
var n = h(e), i = new LabelSelector(_.get(t, "spec.selector")), r = [];
7388873892
return _.each(n, function(t, n) {
7388973893
t.covers(i) && r.push(e[n]);

0 commit comments

Comments
 (0)