#45348 In Activity page, keep "Subprojects" state when navigating between pages

app/views/activities/index.html.erb

@@ -68,13 +68,13 @@ See COPYRIGHT and LICENSE files for more details.
 
 <div style="float:left;">
   <%= link_to_content_update(t(:label_previous),
-                             { from: (@date_to - @days - 1) },
+                             { from: (@date_to - @days - 1), with_subprojects: @with_subprojects ? '1' : '0' },
                              {title: t(:label_date_from_to, start: format_date(@date_to - 2*@days), end: format_date(@date_to - @days - 1)),
                              class: 'navigate-left'}) %>
 </div>
 <div style="float:right;">
   <%= link_to_content_update(t(:label_next),
-                             { from: (@date_to + @days - 1) },
+                             { from: (@date_to + @days - 1), with_subprojects: @with_subprojects ? '1' : '0' },
                              {title: t(:label_date_from_to, start: format_date(@date_to), end: format_date(@date_to + @days - 1)),
                              class: 'navigate-right'}) unless @date_to >= Date.today %>
 </div>
@@ -104,8 +104,8 @@ See COPYRIGHT and LICENSE files for more details.
       <%= hidden_field_tag 'with_subprojects', 0 %>
       <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=t(:label_subproject_plural)%></label></p>
     <% end %>
-    <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
-    <%= hidden_field_tag('apply', true) %>
+    <%= hidden_field_tag('user_id', params[:user_id]) if params[:user_id].present? %>
+    <%= hidden_field_tag('from', params[:from]) if params[:from].present? %>
     <p><%= submit_tag t(:button_apply), class: 'button -small -highlight', name: nil %></p>
     </fieldset>
   <% end %>

spec/features/activities/activity_page_navigation_spec.rb

@@ -0,0 +1,142 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2022 the OpenProject GmbH
+#
+# 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-2013 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 COPYRIGHT and LICENSE files for more details.
+#++
+
+require 'spec_helper'
+
+describe 'Activity page navigation' do
+  include ActiveSupport::Testing::TimeHelpers
+
+  shared_let(:project) { create(:project, enabled_module_names: Setting.default_projects_modules + ['activity']) }
+  shared_let(:subproject) do
+    create(:project, parent: project, enabled_module_names: Setting.default_projects_modules + ['activity'])
+  end
+  shared_let(:user) do
+    create(:user,
+           member_in_projects: [project, subproject],
+           member_with_permissions: %w[view_work_packages])
+  end
+  shared_let(:project_work_package) { create(:work_package, project:, subject: 'Work package for parent project') }
+  shared_let(:subproject_work_package) { create(:work_package, project: subproject, subject: 'Work package for subproject') }
+  shared_let(:project_older_work_package) do
+    travel_to 45.days.ago
+    create(:work_package, project:, subject: 'Work package older for parent project')
+  ensure
+    travel_back
+  end
+  shared_let(:subproject_older_work_package) do
+    travel_to 45.days.ago
+    create(:work_package, project: subproject, subject: 'Work package older for subproject')
+  ensure
+    travel_back
+  end
+
+  current_user { user }
+
+  it 'stays on the same period when changing filters' do
+    visit project_activity_index_path(project)
+    click_link('Previous')
+
+    expect(page)
+      .to have_link(text: /#{subproject_older_work_package.subject}/)
+
+    uncheck 'Subprojects'
+    click_button 'Apply'
+
+    # Still on the same page. Filters applied. subproject work package created
+    # 45 days ago should not be visible anymore
+    expect(page)
+      .not_to have_link(text: /#{subproject_older_work_package.subject}/)
+  end
+
+  shared_examples 'subprojects checkbox state is preserved' do
+    it 'keeps Subprojects checked/unchecked when navigating between pages' do
+      visit project_activity_index_path(project)
+
+      aggregate_failures do
+        # Subprojects is initially checked or not depending on a setting
+        if Setting.display_subprojects_work_packages?
+          expect(page).to have_checked_field('Subprojects')
+        else
+          expect(page).to have_unchecked_field('Subprojects')
+        end
+
+        # work packages for both projects are visible
+        expect(page)
+          .to have_link(text: /#{project_work_package.subject}/)
+        expect(page)
+          .to have_link(text: /#{subproject_work_package.subject}/)
+      end
+
+      uncheck 'Subprojects'
+      click_button 'Apply'
+
+      aggregate_failures do
+        expect(page).to have_unchecked_field('Subprojects')
+        expect(page)
+          .to have_link(text: /#{project_work_package.subject}/)
+        # work packages for subproject is not visible anymore
+        expect(page)
+          .not_to have_link(text: /#{subproject_work_package.subject}/)
+      end
+
+      click_link('Previous')
+
+      aggregate_failures do
+        # Subprojects should still be unchecked, bug #45348
+        expect(page).to have_unchecked_field('Subprojects')
+        expect(page)
+          .to have_link(text: /#{project_older_work_package.subject}/)
+
+        # work packages for subproject still not visible
+        expect(page)
+          .not_to have_link(text: /#{subproject_older_work_package.subject}/)
+      end
+
+      click_link('Next')
+
+      aggregate_failures do
+        # Subprojects should still be unchecked, bug #45348
+        expect(page).to have_unchecked_field('Subprojects')
+        expect(page)
+          .to have_link(text: /#{project_work_package.subject}/)
+
+        # work packages for subproject still not visible
+        expect(page)
+          .not_to have_link(text: /#{subproject_work_package.subject}/)
+      end
+    end
+  end
+
+  context 'with subprojects included by default', with_setting: { display_subprojects_work_packages: true } do
+    include_examples 'subprojects checkbox state is preserved'
+  end
+
+  context 'with subprojects NOT included by default', with_setting: { display_subprojects_work_packages: false } do
+    include_examples 'subprojects checkbox state is preserved'
+  end
+end