Skip to content

Commit

Permalink
Merge pull request #6543 from ChrisBr/bootstrap/monitor
Browse files Browse the repository at this point in the history 
Monitor page: use server side filtering again
  • Loading branch information
@ChrisBr
ChrisBr committed Dec 10, 2018
2 parents f74b6a1 + d66c576 commit 561a812
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 210 deletions.
93 changes: 6 additions & 87 deletions src/api/app/assets/javascripts/webui2/project_monitor.js
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,9 @@
function hideRepositoryColumns() {
var table = $('#project-monitor-table').DataTable();

var repositories = [];
$('#project-monitor-repositories-dropdown input:checked').each(function () {
repositories.push($(this).val().trim());
});

if (repositories.length === 0) {
return;
}

var toShowColumns = [];
var offSet = 0;
$('#project-monitor-table thead tr:eq(0) th').each(function () {
var column = $(this);
var colSpan = column.prop('colspan');
if (repositories.includes(column.text().trim())) {
var range = [];
for (var i = offSet; i < offSet + colSpan; i++) {
range.push(i);
}
toShowColumns = toShowColumns.concat(range);
}
offSet += colSpan;
});

table.columns().every(function () {
var index = this.index();
if (index === 0) return;
this.visible(toShowColumns.includes(index));
});
}

function hideArchitectureColumns() {
var table = $('#project-monitor-table').DataTable();

var architectures = [];
$('#project-monitor-architectures-dropdown input:checked').each(function () {
architectures.push($(this).val());
});

if (architectures.length === 0) {
return;
}

table.columns().every(function () {
if (this.index() === 0) return;
if (!this.visible()) return;

var title = $(this.header()).text().trim();
this.visible(architectures.includes(title));
});
}

function updateStatusSearch() {
var table = $('#project-monitor-table').DataTable();
var searchInput = $('#project-monitor_filter input');

var terms = [];
$('#project-monitor-status-dropdown input:checked').each(function () {
terms.push($(this).val());
});

var searchTerm = terms.join("|");
searchInput.val(searchTerm);
table.search(searchTerm).draw();
}

function updateMonitorFilters() {
updateStatusSearch();
var table = $('#project-monitor-table').DataTable();
table.columns().visible(true);
hideRepositoryColumns();
hideArchitectureColumns();
function setupPopover() {
$('[data-toggle="popover"]').popover({ trigger: 'hover click' });
}

function setupProjectMonitor() { // jshint ignore:line
initializeDataTable('#project-monitor-table', { // jshint ignore:line
scrollX: true,
scrollY: "50vh",
fixedColumns: true,
pageLength: 50,
lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
Expand All @@ -88,19 +13,13 @@ function setupProjectMonitor() { // jshint ignore:line
}
});

$('[data-toggle="popover"]').popover({ trigger: 'hover click' });

$('#project-monitor-status-dropdown input:checkbox').on('change', function () {
updateStatusSearch();
$('#project-monitor-table').on('draw.dt', function () {
setupPopover();
});

setupPopover();

$('.monitor-no-filter-link').on('click', function () {
$(this).siblings().children('input:checked').prop('checked', false);
updateMonitorFilters();

});

$('#project-monitor-architectures-dropdown input:checkbox, #project-monitor-repositories-dropdown input:checkbox').on('change', function () {
updateMonitorFilters();
});
}
6 changes: 0 additions & 6 deletions src/api/app/controllers/webui/project_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,6 @@ def move_path
end

def monitor
if params.keys.length < 4
@activate_client_search = true
else
flash[:notice] = "Limited search results, click #{view_context.link_to('here', project_monitor_path(@project))} to remove the filter."
end

@legend = Buildresult::STATUS_DESCRIPTION

@name_filter = params[:pkgname]
Expand Down
31 changes: 16 additions & 15 deletions src/api/app/views/webui2/webui/project/_monitor_control.html.haml
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
.row
.col-md-12
- if activate_client_search
= form_tag(project_monitor_path, method: :get) do
= hidden_field_tag :project, project
= hidden_field_tag :defaults, 0
%span.dropdown#project-monitor-status-dropdown
%button.btn.btn-outline-secondary.dropdown-toggle{ data: { toggle: :dropdown }, type: :button }
%span.caret
Status
.dropdown-menu
%button.btn.btn-link.monitor-no-filter-link No filter
%button.btn.btn-link.monitor-no-filter-link{ type: :button } No filter
- status.each do |status|
.custom-control.custom-checkbox.dropdown-item.ml-2
%input.custom-control-input{ type: :checkbox, id: "#{status}-checkbox".parameterize, checked: false, value: status }
%label.custom-control-label{ for: "#{status}-checkbox".parameterize }
= check_box_tag valid_xml_id(status), 1, status_filter.include?(status), class: 'custom-control-input'
%label.custom-control-label{ for: valid_xml_id(status) }
= status
%span.dropdown#project-monitor-architectures-dropdown
%button.btn.btn-outline-secondary.dropdown-toggle{ data: { toggle: :dropdown }, type: :button }
%span.caret
Architecture
.dropdown-menu
%button.btn.btn-link.monitor-no-filter-link No filter
%button.btn.btn-link.monitor-no-filter-link{ type: :button } No filter
- architectures.each do |architecture|
.custom-control.custom-checkbox.dropdown-item.ml-2
%input.custom-control-input{ type: :checkbox, id: "#{architecture}-checkbox".parameterize, checked: false, value: architecture }
%label.custom-control-label{ for: "#{architecture}-checkbox".parameterize }
= check_box_tag valid_xml_id('arch_' + architecture), 1, architecture_filter.include?(architecture), class: 'custom-control-input'
%label.custom-control-label{ for: valid_xml_id('arch_' + architecture) }
= architecture
%span.dropdown#project-monitor-repositories-dropdown
%button.btn.btn-outline-secondary.dropdown-toggle{ data: { toggle: :dropdown }, type: :button }
%span.caret
Repository
.dropdown-menu
%button.btn.btn-link.monitor-no-filter-link No filter
%button.btn.btn-link.monitor-no-filter-link{ type: :button } No filter
- repositories.each do |repository|
.custom-control.custom-checkbox.dropdown-item.ml-2
%input.custom-control-input{ type: :checkbox, id: "#{repository}-checkbox".parameterize, checked: false, value: repository }
%label.custom-control-label{ for: "#{repository}-checkbox".parameterize }
= check_box_tag valid_xml_id('repo_' + repository), 1, repository_filter.include?(repository), class: 'custom-control-input'
%label.custom-control-label{ for: valid_xml_id('repo_' + repository) }
= repository
%button.btn.btn-outline-secondary{ data: { toggle: 'modal', target: '#build-monitor-legend' }, title: 'Build status legend' }
%button.btn.btn-outline-primary{ type: :submit }
Filter
%button.btn.btn-outline-secondary.float-right{ type: :button,
data: { toggle: 'modal', target: '#build-monitor-legend' }, title: 'Build status legend' }
Legend
- unless activate_client_search
.float-right
%a.btn.btn-outline-primary{ href: project_monitor_path(project) }
Remove filter

.modal.fade#build-monitor-legend{ tabindex: -1, role: 'dialog', aria: { labelledby: 'confirm-modal-label', hidden: true } }
.modal-dialog.modal-dialog-centered.modal-lg{ role: 'document' }
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui2/webui/project/monitor.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
.card-body#project-monitor
= render partial: 'monitor_control',
locals: { project: @project, activate_client_search: @activate_client_search,
status: @avail_status_values, repositories: @avail_repo_values, architectures: @avail_arch_values }
status: @avail_status_values, repositories: @avail_repo_values, architectures: @avail_arch_values,
repository_filter: @repo_filter, architecture_filter: @arch_filter, status_filter: @status_filter }
.row.mt-4
.col-md-12.obs-dataTable
%table.table.table-sm.table-striped.table-bordered.text-nowrap.w-100#project-monitor-table
Expand Down
101 changes: 0 additions & 101 deletions src/api/spec/bootstrap/features/webui/projects/monitor_spec.rb
View file

This file was deleted.

0 comments on commit 561a812

Please sign in to comment.