From c3eee4b4a072d25d7c761139ea2a34c17555b838 Mon Sep 17 00:00:00 2001 From: Matt D'Angelo Date: Mon, 20 Oct 2025 14:26:38 +1030 Subject: [PATCH] Redirect to consolidated list when FF is enabled --- app/controllers/groups_controller.rb | 9 +++++++++ ee/app/controllers/groups/epics_controller.rb | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 33d5aa8d9808e5..30e7c1d8f313b0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -34,6 +34,8 @@ class GroupsController < Groups::ApplicationController before_action :check_export_rate_limit!, only: [:export, :download_export] before_action only: :issues do + redirect_issues_to_work_items + push_force_frontend_feature_flag(:work_items_beta, group.work_items_beta_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_alpha, group.work_items_alpha_feature_flag_enabled?) push_frontend_feature_flag(:issues_list_create_modal, group) @@ -411,6 +413,13 @@ def destroy_immediately # Overridden in EE def redirect_if_epic_params; end + + def redirect_issues_to_work_items + return unless html_request? && ::Feature.enabled?(:work_item_planning_view, group) + + params = request.query_parameters.except("type").merge('type[]' => 'issue') + redirect_to group_work_items_path(group, params: params) + end end GroupsController.prepend_mod diff --git a/ee/app/controllers/groups/epics_controller.rb b/ee/app/controllers/groups/epics_controller.rb index 4ab832fbd05fbd..a6c738c0e9b06d 100644 --- a/ee/app/controllers/groups/epics_controller.rb +++ b/ee/app/controllers/groups/epics_controller.rb @@ -15,6 +15,7 @@ class Groups::EpicsController < Groups::ApplicationController before_action :verify_group_bulk_edit_enabled!, only: [:bulk_update] before_action :set_summarize_notes_feature_flag, only: :show before_action :enforce_work_item_epics_feature_flags, only: [:new, :show] + before_action :redirect_epics_to_work_items, only: :index after_action :log_epic_show, only: :show before_action do @@ -143,4 +144,11 @@ def enforce_work_item_epics_feature_flags def set_summarize_notes_feature_flag push_force_frontend_feature_flag(:summarize_comments, can?(current_user, :summarize_comments, epic)) end + + def redirect_epics_to_work_items + return unless html_request? && ::Feature.enabled?(:work_item_planning_view, group) + + params = request.query_parameters.except("type").merge('type[]' => 'epic') + redirect_to group_work_items_path(group, params: params) + end end -- GitLab