github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Update groups for v1beta3 api

Browse Source
This commit is contained in:
BC Broussard
2015-05-21 01:02:09 -07:00
parent b8a808b1ae
commit 5f53f34931
5 changed files with 972 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/master/components/dashboard/js/modules/controllers/groupController.js
View File

@@ -8,7 +8,7 @@ app.controller('GroupCtrl', [
'$route',
'$interval',
'$routeParams',
'k8sApi',
'k8sv1Beta3Api',
'$rootScope',
'$location',
'lodash',
@@ -105,7 +105,7 @@ app.controller('GroupCtrl', [
k8sApi.getPods(query).success(function(data) {
$scope.addLabel("type", "pod", data.items);
for (var i = 0; data.items && i < data.items.length; ++i) {
data.items[i].labels.host = data.items[i].currentState.host;
data.items[i].metadata.labels.host = data.items[i].spec.host;
list.push(data.items[i]);
}
barrier();
@@ -136,10 +136,10 @@ app.controller('GroupCtrl', [
return;
}
for (var i = 0; i < items.length; i++) {
if (!items[i].labels) {
items[i].labels = [];
if (!items[i].metadata.labels) {
items[i].metadata.labels = [];
}
items[i].labels[key] = value;
items[i].metadata.labels[key] = value;
}
};
@@ -149,7 +149,7 @@ app.controller('GroupCtrl', [
"kind": "grouping"
};
for (var i = 0; i < items.length; i++) {
key = items[i].labels[$scope.groupBy[index]];
key = items[i].metadata.labels[$scope.groupBy[index]];
if (!key) {
key = "";
}
@@ -198,7 +198,7 @@ app.controller('GroupCtrl', [
function buildGroupByOptions() {
var g = $scope.groups;
var options = getDefaultGroupByOptions();
var newOptions = _.map(g.items, function(vals) { return _.map(vals, function(v) { return _.keys(v.labels); }); });
var newOptions = _.map(g.items, function(vals) { return _.map(vals, function(v) { return _.keys(v.metadata.labels); }); });
newOptions =
_.reject(_.uniq(_.flattenDeep(newOptions)), function(o) { return o == 'name' || o == 'type' || o == ""; });
newOptions = _.map(newOptions, function(o) {

14
www/master/components/dashboard/views/partials/groupItem.html
View File

@@ -1,7 +1,7 @@
<div layout="row" ng-if="group.kind != 'grouping'">
<div>
<!-- Default box display -->
<div layout="row" class="group-item" ng-repeat="(groupType, data) in group | groupBy: 'labels.type'">
<div layout="row" class="group-item" ng-repeat="(groupType, data) in group | groupBy: 'metadata.labels.type'">
<!-- left image -->
<div class="icon-area">
<div class="group-icon" style="background-color: {{getGroupColor(groupType)}}"></div>
@@ -16,17 +16,17 @@
<div layout="row" layout-wrap>
<div layout="row" ng-repeat="item in data">
<!-- title -->
<div ng-switch on='item.labels["type"]'>
<div ng-switch on='item.metadata.labels["type"]'>
<div class="group-name">
<a ng-switch-when='pod' ng-href="#/dashboard/pods/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='service' ng-href="#/dashboard/services/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='replicationController' ng-href="#/dashboard/replicationcontrollers/{{ item.id }}">{{ item.id }}</a>
<div ng-switch-default>{{item.id}}</div>
<a ng-switch-when='pod' ng-href="#/dashboard/pods/{{ item.metadata.name }}">{{ item.metadata.name }}</a>
<a ng-switch-when='service' ng-href="#/dashboard/services/{{ item.metadata.name }}">{{ item.metadata.name }}</a>
<a ng-switch-when='replicationController' ng-href="#/dashboard/replicationcontrollers/{{ item.metadata.name }}">{{ item.metadata.name }}</a>
<div ng-switch-default>{{item.metadata.name}}</div>
</div>
</div>
<md-select ng-model="selectedFilter" ng-change="changeFilterBy(selectedFilter)" class="selectFilter">
<md-optgroup label="FILTER">
<md-option ng-value="'{{key}}={{value}}'" ng-repeat="(key, value) in item.labels">{{key}}: {{value}}</md-option>
<md-option ng-value="'{{key}}={{value}}'" ng-repeat="(key, value) in item.metadata.labels">{{key}}: {{value}}</md-option>
</md-option-group>
</md-optgroup>
</md-select>