OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Abort infinite scrolling for 1 page collections
Kabiru Mwenjaaabd15be15bd
diff --git a/app/components/work_packages/activities_tab/index_component.rb b/app/components/work_packages/activities_tab/index_component.rbindex 574870697f5..8020ad4d4cf 100644--- a/app/components/work_packages/activities_tab/index_component.rb+++ b/app/components/work_packages/activities_tab/index_component.rb@@ -37,11 +37,12 @@ module WorkPackagesinclude WorkPackages::ActivitiesTab::SharedHelpersinclude WorkPackages::ActivitiesTab::StimulusControllers- def initialize(work_package:, journals:, last_server_timestamp:, filter: :all)+ def initialize(work_package:, journals:, paginator:, last_server_timestamp:, filter: :all)super@work_package = work_package@journals = journals+ @paginator = paginator@filter = filter@last_server_timestamp = last_server_timestampend@@ -56,7 +57,8 @@ module WorkPackagesenddef list_journals_component- WorkPackages::ActivitiesTab::Journals::IndexComponent.new(work_package:, journals:, filter:)+ WorkPackages::ActivitiesTab::Journals::IndexComponent+ .new(work_package:, journals:, filter:, page: paginator.page, next_page: paginator.next)enddef add_journal_component@@ -69,7 +71,7 @@ module WorkPackagesprivate- attr_reader :work_package, :journals, :filter, :last_server_timestamp+ attr_reader :work_package, :journals, :paginator, :filter, :last_server_timestampdef wrapper_data_attributes # rubocop:disable Metrics/AbcSizestimulus_controllers = {diff --git a/app/components/work_packages/activities_tab/journals/index_component.html.erb b/app/components/work_packages/activities_tab/journals/index_component.html.erbindex 1894da30916..dc05d390db3 100644--- a/app/components/work_packages/activities_tab/journals/index_component.html.erb+++ b/app/components/work_packages/activities_tab/journals/index_component.html.erb@@ -6,28 +6,27 @@mb: inner_container_margin_bottom) doflex_layout(- id: insert_target_modifier_id,data: { test_selector: "op-wp-journals-container" }) do |journals_index_container|if empty_state?journals_index_container.with_row(mt: 2, mb: 3) dorender(WorkPackages::ActivitiesTab::Journals::EmptyComponent.new)end- end-- if journal_sorting_asc?- journals_index_container.with_row do- render(infinite_scroll_component)+ else+ if journal_sorting_asc?+ journals_index_container.with_row do+ render(infinite_scroll_component)+ endend- end- journals_index_container.with_row do- render(page_component)- end+ journals_index_container.with_row(id: insert_target_modifier_id) do+ render(page_component)+ end- if journal_sorting_desc?- journals_index_container.with_row do- render(infinite_scroll_component)+ if journal_sorting_desc?+ journals_index_container.with_row do+ render(infinite_scroll_component)+ endendendenddiff --git a/app/components/work_packages/activities_tab/journals/index_component.rb b/app/components/work_packages/activities_tab/journals/index_component.rbindex af4d63d873a..86d049ca7ed 100644--- a/app/components/work_packages/activities_tab/journals/index_component.rb+++ b/app/components/work_packages/activities_tab/journals/index_component.rb@@ -37,28 +37,27 @@ module WorkPackagesinclude OpTurbo::Streamableinclude WorkPackages::ActivitiesTab::SharedHelpers- def initialize(work_package:, journals:, filter: :all)+ def initialize(work_package:, journals:, page: 1, next_page: nil, filter: :all)super@work_package = work_package@journals = journals+ @page = page+ @next_page = next_page@filter = filterenddef infinite_scroll_component- WorkPackages::ActivitiesTab::Journals::InfiniteScrollComponent.new(work_package:)+ WorkPackages::ActivitiesTab::Journals::InfiniteScrollComponent.new(work_package:, page:, next_page:)enddef page_component- WorkPackages::ActivitiesTab::Journals::PageComponent.new(journals:, emoji_reactions:, page: 1, filter:)+ WorkPackages::ActivitiesTab::Journals::PageComponent.new(journals:, emoji_reactions:, page:, filter:)end- def self.insert_target_modifier_id = "work-package-journal-days"- delegate :insert_target_modifier_id, to: :class-private- attr_reader :work_package, :journals, :filter+ attr_reader :work_package, :journals, :page, :next_page, :filterdef insert_target_modified?truediff --git a/app/components/work_packages/activities_tab/journals/infinite_scroll_component.html.erb b/app/components/work_packages/activities_tab/journals/infinite_scroll_component.html.erbindex cb2210183fd..b28b82e7b21 100644--- a/app/components/work_packages/activities_tab/journals/infinite_scroll_component.html.erb+++ b/app/components/work_packages/activities_tab/journals/infinite_scroll_component.html.erb@@ -1,7 +1,7 @@<%=component_wrapper(data: wrapper_data_attributes) doflex_layout(- data: { infinite_scroll_target: "skeleton" },+ data: { "#{infinite_scroll_stimulus_controller}-target": "skeleton" },class: "work-packages-activities-tab-journals-item-component",bg: :default) do |skeleton|diff --git a/app/components/work_packages/activities_tab/journals/infinite_scroll_component.rb b/app/components/work_packages/activities_tab/journals/infinite_scroll_component.rbindex 4773cc8d6fe..dd0a8932781 100644--- a/app/components/work_packages/activities_tab/journals/infinite_scroll_component.rb+++ b/app/components/work_packages/activities_tab/journals/infinite_scroll_component.rb@@ -36,29 +36,26 @@ module WorkPackagesinclude OpTurbo::Streamableinclude WorkPackages::ActivitiesTab::StimulusControllers- def initialize(work_package:)+ def initialize(work_package:, page: 1, next_page: nil)super@work_package = work_package+ @page = page+ @next_page = next_pageendprivate- attr_reader :work_package+ attr_reader :work_package, :page, :next_pagedef wrapper_data_attributes{controller: infinite_scroll_stimulus_controller,- infinite_scroll_stimulus_controller("-insert-target-id-value") => insert_target_id,- infinite_scroll_stimulus_controller("-page-value") => 1,- infinite_scroll_stimulus_controller("-is-last-page-value") => false,+ infinite_scroll_stimulus_controller("-page-value") => page,+ infinite_scroll_stimulus_controller("-is-last-page-value") => next_page.blank?,infinite_scroll_stimulus_controller("-url-value") => page_streams_url}end- def insert_target_id- WorkPackages::ActivitiesTab::Journals::IndexComponent.insert_target_modifier_id- end-def page_streams_urlpage_streams_work_package_activities_path(work_package, format: :turbo_stream)enddiff --git a/app/controllers/work_packages/activities_tab_controller.rb b/app/controllers/work_packages/activities_tab_controller.rbindex c0b1a770c6a..5a2ac8ce24b 100644--- a/app/controllers/work_packages/activities_tab_controller.rb+++ b/app/controllers/work_packages/activities_tab_controller.rb@@ -46,6 +46,7 @@ class WorkPackages::ActivitiesTabController < ApplicationControllerWorkPackages::ActivitiesTab::IndexComponent.new(work_package: @work_package,journals: @paginated_journals,+ paginator: @paginator,filter: @filter,last_server_timestamp: get_current_server_timestamp),@@ -358,6 +359,7 @@ class WorkPackages::ActivitiesTabController < ApplicationControllercomponent: WorkPackages::ActivitiesTab::IndexComponent.new(work_package: @work_package,journals: @paginated_journals,+ paginator: @paginator,filter: @filter,last_server_timestamp: get_current_server_timestamp)diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/infinite-scroll.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/infinite-scroll.controller.tsindex 2681b812fce..652c388b139 100644--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/infinite-scroll.controller.ts+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/infinite-scroll.controller.ts@@ -74,6 +74,13 @@ export default class extends BaseController {});}+ isLastPageValueChanged(isLastPage:boolean, _previousValue:boolean) {+ if (isLastPage) {+ (this.element as HTMLElement).hidden = true;+ if (this.hasSkeletonTarget) this.skeletonTarget.remove();+ }+ }+private fetchNextPageStream():Promise<{ html:string, headers:Headers }> {const url = this.preparePageStreamsUrl();return this.turboRequests.requestStream(url);