Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit number of objects on topology views #95

Merged
merged 1 commit into from
Jan 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,16 @@ function ContainerTopologyCtrl($scope, $http, $interval, topologyService, $windo
* added: Just the ones that were added
*/

/*
If we remove some kinds beforehand, and then try to bring them back we
get the hash {kind: undefined} instead of {kind: true}.
*/
if ($scope.kinds) {
Object.keys($scope.kinds).forEach(function (key) {
$scope.kinds[key] = true
});
}

added.attr("class", function(d) {
return d.item.kind;
});
Expand Down Expand Up @@ -284,9 +294,21 @@ function ContainerTopologyCtrl($scope, $http, $interval, topologyService, $windo
$scope.relations = data.data.relations;
$scope.kinds = data.data.kinds;
icons = data.data.icons;
var size_limit = data.data.settings.containers_max_objects;

if (currentSelectedKinds && (Object.keys(currentSelectedKinds).length !== Object.keys($scope.kinds).length)) {
$scope.kinds = currentSelectedKinds;
} else if (size_limit > 0) {
var remove_hierarchy = ['Container',
'ContainerGroup',
'ContainerReplicator',
'ContainerService',
'ContainerRoute',
'Host',
'Vm',
'ContainerNode',
'ContainerManager'];
$scope.kinds = topologyService.reduce_kinds($scope.items, $scope.kinds, size_limit, remove_hierarchy);
}
}
}
14 changes: 14 additions & 0 deletions app/assets/javascripts/services/topology_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,18 @@ ManageIQ.angular.app.service('topologyService', function() {
return "unknown";
}
};

this.reduce_kinds = function(items, kinds, size_limit, remove_hierarchy) {
var tmp_list = _.values(items);
var kind_index = 0;
while ((tmp_list.length > size_limit) && kind_index < remove_hierarchy.length) {
var kind_to_hide = remove_hierarchy[kind_index];
tmp_list = tmp_list.filter(function(item) {
return item['kind'] != kind_to_hide;
});
kind_index++;
delete kinds[kind_to_hide]
}
return kinds
};
});
1 change: 1 addition & 0 deletions app/controllers/configuration_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ def get_form_vars
@edit[:new][:perpage][:tile] = params[:perpage_tile].to_i if params[:perpage_tile]
@edit[:new][:perpage][:list] = params[:perpage_list].to_i if params[:perpage_list]
@edit[:new][:perpage][:reports] = params[:perpage_reports].to_i if params[:perpage_reports]
@edit[:new][:topology][:containers_max_objects] = params[:topology_containers_max_objects].to_i if params[:topology_containers_max_objects]
@edit[:new][:display][:theme] = params[:display_theme] unless params[:display_theme].nil?
@edit[:new][:display][:bg_color] = params[:bg_color] unless params[:bg_color].nil?
@edit[:new][:display][:reporttheme] = params[:display_reporttheme] unless params[:display_reporttheme].nil?
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/topology_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ def get_session_data
end

def generate_topology(provider_id)
self.class.service_class.new(provider_id).build_topology
self.class.service_class.new(provider_id).build_topology.merge(:settings => current_user.settings[:topology])
end
end
3 changes: 3 additions & 0 deletions app/helpers/ui_constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ module UiConstants
:list => 20,
:reports => 20
},
:topology => {
:containers_max_items => 0
},
:display => {
:startpage => "/dashboard/show",
:reporttheme => "MIQ",
Expand Down
13 changes: 13 additions & 0 deletions app/views/configuration/_ui_1.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@

:javascript
miqSelectPickerEvent("#{item_per_page[1]}", "#{url}")
%fieldset
%h3
= _('Topology Default Items in View')
- [[_("Containers"), "topology_containers_max_objects", :containers_max_objects]].each do |item_per_page|
.form-group
%label.col-md-3.control-label
= _(item_per_page[0])
.col-md-8
= select_tag(_(item_per_page[1]),
options_for_select([[N_("Unlimited"), 0]].concat(PPCHOICES), @edit[:new][:topology][item_per_page[2]]),
:class => "selectpicker")
:javascript
miqSelectPickerEvent("#{item_per_page[1]}", "#{url}")
%fieldset
%h3
= _('Display Settings')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,5 +349,8 @@
"Vm":{"type":"glyph","icon":"","fontfamily":"PatternFlyIcons-webfont"},
"Kubernetes":{"type":"image","icon":"...kubernetes..."},
"Openshift":{"type":"image","icon":"...openshift..."},
"OpenshiftEnterprise":{"type":"image","icon":"...openshift_enterprise..."}}}
"OpenshiftEnterprise":{"type":"image","icon":"...openshift_enterprise..."}
},
"settings": { "containers_max_objects":100}
}
}