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
Support paginated deep linking of comments
Kabiru Mwenja79673c5a8962
diff --git a/app/controllers/work_packages/activities_tab_controller.rb b/app/controllers/work_packages/activities_tab_controller.rbindex b037318a942..1449722c1e6 100644--- a/app/controllers/work_packages/activities_tab_controller.rb+++ b/app/controllers/work_packages/activities_tab_controller.rb@@ -192,11 +192,49 @@ class WorkPackages::ActivitiesTabController < ApplicationControllerprivatedef initialize_pagination- @paginator, @paginated_journals = pagy_array(base_journals, items: 30)+ anchor_type, target_journal_id = extract_target_journal_id++ @paginator, @paginated_journals =+ if anchor_type && target_journal_id+ pagy_array_for_target_journal(anchor_type, target_journal_id)+ else+ pagy_array(base_journals)+ end+# For UI display: if user wants "oldest first" UI, reverse the array@paginated_journals = @paginated_journals.reverse if journal_sorting.asc?end+ def extract_target_journal_id+ anchor = params[:anchor] # e.g., "comment-78758" (without #)+ return nil unless anchor++ match = anchor.match(/^(comment|activity)-(\d+)$/)+ match && match.length == 3 ? [match[1].inquiry, match[2].to_i] : []+ end++ def pagy_array_for_target_journal(anchor_type, target_journal_id)+ journals = base_journals++ target_index = journals.find_index do |record|+ if anchor_type.comment?+ record.id == target_journal_id+ elsif anchor_type.activity?+ record.sequence_version == target_journal_id+ else+ false+ end+ end++ if target_index+ target_page = (target_index / Pagy::DEFAULT[:limit]) + 1+ pagy_array(journals, page: target_page)+ else+ # Journal might be filtered out or deleted - fallback to page 1+ pagy_array(journals, page: 1)+ end+ end+def base_journalscombine_and_sort_records(fetch_journals, fetch_revisions)enddiff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.tsindex 76711600c94..518a0d33762 100644--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts@@ -59,6 +59,22 @@ export class ActivityPanelBaseController extends UntilDestroyedMixin implements}ngOnInit():void {- this.turboFrameSrc = `${this.pathHelper.staticBase}/work_packages/${this.workPackageId}/activities`;+ this.turboFrameSrc = this.buildTurboFrameSrc();+ }++ protected buildTurboFrameSrc(): string {+ const baseUrl = `${this.pathHelper.staticBase}/work_packages/${this.workPackageId}/activities`;+ const hash = window.location.hash;++ if (hash) {+ // Extract anchor (e.g., "#comment-123" or "#activity-456")+ const anchorMatch = hash.match(/^#(comment|activity)-(\d+)$/i);+ if (anchorMatch && anchorMatch.length === 3) {+ const anchor = hash.slice(1); // Remove # prefix+ return `${baseUrl}?anchor=${encodeURIComponent(anchor)}`;+ }+ }++ return baseUrl;}}