diff --git a/app/scripts/controllers/otherResources.js b/app/scripts/controllers/otherResources.js index 60b3cd74d3..69811a7abf 100644 --- a/app/scripts/controllers/otherResources.js +++ b/app/scripts/controllers/otherResources.js @@ -57,6 +57,14 @@ angular.module('openshiftConsole') }).toString(); }; + var counts; + $scope.isDuplicateKind = function(kind) { + if(!counts) { + counts = _.countBy($scope.kinds, 'kind'); + } + return counts[kind] > 1; + }; + // get and clear any alerts AlertMessageService.getAlerts().forEach(function(alert) { $scope.alerts[alert.name] = alert.data; diff --git a/app/views/other-resources.html b/app/views/other-resources.html index 6c91e1be96..56942fcad6 100644 --- a/app/views/other-resources.html +++ b/app/views/other-resources.html @@ -14,6 +14,7 @@

Other Resources

{{$select.selected.kind | humanizeKind : true}}
+
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index ff88c42c71..796dbbedcf 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -7482,10 +7482,14 @@ projectName:a.project, kind:b, group:_.get(c, "kindSelector.selected.group", "") }).toString() :""; +}; +var n; +c.isDuplicateKind = function(a) { +return n || (n = _.countBy(c.kinds, "kind")), n[a] > 1; }, d.getAlerts().forEach(function(a) { c.alerts[a.name] = a.data; }), d.clearAlerts(); -var n = function(a, b) { +var o = function(a, b) { return _.some(c.kinds, function(c) { return c.kind === a && (!c.group && !b || c.group === b); }); @@ -7497,13 +7501,13 @@ resource:k.kindToResource(a.kind), group:a.group || "" }; return !!e.checkResource(b.resource) && e.canI(b, "list", c.projectName); -}), c.project = b, c.context = d, c.kindSelector.disabled = !1, a.kind && n(a.kind, a.group) && (_.set(c, "kindSelector.selected.kind", a.kind), _.set(c, "kindSelector.selected.group", a.group || "")); +}), c.project = b, c.context = d, c.kindSelector.disabled = !1, a.kind && o(a.kind, a.group) && (_.set(c, "kindSelector.selected.kind", a.kind), _.set(c, "kindSelector.selected.group", a.group || "")); })), c.loadKind = m, c.$watch("kindSelector.selected", function() { c.alerts = {}, m(); }); -var o = h("humanizeKind"); +var p = h("humanizeKind"); c.matchKind = function(a, b) { -return o(a).toLowerCase().indexOf(b.toLowerCase()) !== -1; +return p(a).toLowerCase().indexOf(b.toLowerCase()) !== -1; }, i.onActiveFiltersChanged(function(a) { c.$apply(function() { c.resources = a.select(c.unfilteredResources), l(); diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index 11638626c6..fb47a3c1c5 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -11667,6 +11667,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "{{$select.selected.kind | humanizeKind : true}}\n" + "\n" + "
\n" + + "\n" + "
\n" + "\n" + "
\n" +