[26675] Remove implicit ID sorting on parent sort (#6039)
* [26675] Remove implicit ID sorting on parent sort https://community.openproject.com/wp/26675 * parent sort -> breadth first sort, top down [ci skip]pull/6045/head
parent
1585209703
commit
0d55bc0308
@ -0,0 +1,117 @@ |
|||||||
|
#-- copyright |
||||||
|
# OpenProject is a project management system. |
||||||
|
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF) |
||||||
|
# |
||||||
|
# This program is free software; you can redistribute it and/or |
||||||
|
# modify it under the terms of the GNU General Public License version 3. |
||||||
|
# |
||||||
|
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||||
|
# Copyright (C) 2006-2017 Jean-Philippe Lang |
||||||
|
# Copyright (C) 2010-2013 the ChiliProject Team |
||||||
|
# |
||||||
|
# This program is free software; you can redistribute it and/or |
||||||
|
# modify it under the terms of the GNU General Public License |
||||||
|
# as published by the Free Software Foundation; either version 2 |
||||||
|
# of the License, or (at your option) any later version. |
||||||
|
# |
||||||
|
# This program is distributed in the hope that it will be useful, |
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
# GNU General Public License for more details. |
||||||
|
# |
||||||
|
# You should have received a copy of the GNU General Public License |
||||||
|
# along with this program; if not, write to the Free Software |
||||||
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
# |
||||||
|
# See doc/COPYRIGHT.rdoc for more details. |
||||||
|
#++ |
||||||
|
|
||||||
|
module Components |
||||||
|
module WorkPackages |
||||||
|
class SortBy |
||||||
|
include Capybara::DSL |
||||||
|
include RSpec::Matchers |
||||||
|
|
||||||
|
def sort_via_header(name, descending: false) |
||||||
|
text = descending ? 'Sort descending' : 'Sort ascending' |
||||||
|
|
||||||
|
open_table_column_context_menu(name) |
||||||
|
|
||||||
|
within_column_context_menu do |
||||||
|
click_link text |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def update_criteria(first, second=nil, third=nil) |
||||||
|
open_modal |
||||||
|
|
||||||
|
[first, second, third] |
||||||
|
.compact |
||||||
|
.each_with_index do |entry, i| |
||||||
|
|
||||||
|
column, direction = entry |
||||||
|
update_nth_criteria(i, column, descending: descending?(direction)) |
||||||
|
end |
||||||
|
|
||||||
|
apply_changes |
||||||
|
end |
||||||
|
|
||||||
|
def expect_criteria(first, second=nil, third=nil) |
||||||
|
open_modal |
||||||
|
|
||||||
|
[first, second, third] |
||||||
|
.compact |
||||||
|
.each_with_index do |entry, i| |
||||||
|
|
||||||
|
column, direction = entry |
||||||
|
page.within(".modal-sorting-row-#{i}") do |
||||||
|
expect(page).to have_selector("#modal-sorting-attribute-#{i} option", text: column) |
||||||
|
checked_radio = (descending?(direction) ? 'Descending' : 'Ascending') |
||||||
|
expect(page.find_field(checked_radio)).to be_checked |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
cancel_changes |
||||||
|
end |
||||||
|
|
||||||
|
def update_nth_criteria(i, column, descending: false) |
||||||
|
page.within(".modal-sorting-row-#{i}") do |
||||||
|
select column, from: "modal-sorting-attribute-#{i}" |
||||||
|
choose(descending ? 'Descending' : 'Ascending') |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def open_modal |
||||||
|
SettingsMenu.new.open_and_choose('Sort by ...') |
||||||
|
end |
||||||
|
|
||||||
|
def cancel_changes |
||||||
|
page.within('.ng-modal-inner') do |
||||||
|
click_on 'Cancel' |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def apply_changes |
||||||
|
page.within('.ng-modal-inner') do |
||||||
|
click_on 'Apply' |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def descending?(direction) |
||||||
|
['desc', 'descending'].include?(direction.to_s) |
||||||
|
end |
||||||
|
|
||||||
|
def open_table_column_context_menu(name) |
||||||
|
page.find(".generic-table--sort-header ##{name.downcase}").click |
||||||
|
end |
||||||
|
|
||||||
|
def within_column_context_menu |
||||||
|
page.within('#column-context-menu') do |
||||||
|
yield |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
end |
Loading…
Reference in new issue