Merge branch...

Merge branch '211782-hidden-default-stages-in-value-stream-analytics-appearing-in-duration-chart' into 'master'

HIdden default stages appearing in duration chart

Closes #211782

See merge request gitlab-org/gitlab!27568

ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue

@@ -304,9 +304,9 @@ export default {
           <div class="mt-3 d-flex">
             <h4 class="mt-0">{{ s__('CycleAnalytics|Days to completion') }}</h4>
             <stage-dropdown-filter
-              v-if="stages.length"
+              v-if="activeStages.length"
               class="ml-auto"
-              :stages="stages"
+              :stages="activeStages"
               @selected="onDurationStageSelect"
             />
           </div>

ee/changelogs/unreleased/211782-hidden-default-stages-appearing-in-duration-chart.yml

+---
+title: Hidden stages should not appear in duration chart
+merge_request: 27568
+author:
+type: fixed

ee/spec/features/analytics/cycle_analytics/cycle_analytics_spec.rb

@@ -402,6 +402,7 @@ describe 'Group Value Stream Analytics', :js do
     let(:params) { { name: custom_stage_name, start_event_identifier: start_event_identifier, end_event_identifier: end_event_identifier } }
     let(:first_default_stage) { page.find('.stage-nav-item-cell', text: "Issue").ancestor(".stage-nav-item") }
     let(:first_custom_stage) { page.find('.stage-nav-item-cell', text: custom_stage_name).ancestor(".stage-nav-item") }
+    let(:nav) { page.find(stage_nav_selector) }
 
     def create_custom_stage
       Analytics::CycleAnalytics::Stages::CreateService.new(parent: group, params: params, current_user: user).execute
@@ -632,8 +633,6 @@ describe 'Group Value Stream Analytics', :js do
 
       context 'Stage table' do
         context 'default stages' do
-          let(:nav) { page.find(stage_nav_selector) }
-
           def open_recover_stage_dropdown
             find(add_stage_button).click
 
@@ -742,6 +741,47 @@ describe 'Group Value Stream Analytics', :js do
           end
         end
       end
+
+      context 'Duration chart' do
+        let(:duration_chart_dropdown) { page.find('.dropdown-stages') }
+
+        default_stages = %w[Issue Plan Code Test Review Staging Total].freeze
+
+        def duration_chart_stages
+          duration_chart_dropdown.all('.dropdown-menu-link').collect(&:text)
+        end
+
+        def toggle_duration_chart_dropdown
+          duration_chart_dropdown.click
+        end
+
+        before do
+          select_group
+        end
+
+        it 'has all the default stages' do
+          toggle_duration_chart_dropdown
+
+          expect(duration_chart_stages).to eq(default_stages)
+        end
+
+        context 'hidden stage' do
+          before do
+            toggle_more_options(first_default_stage)
+
+            click_button "Hide stage"
+
+            # wait for the stage list to laod
+            expect(nav).to have_content("Plan")
+          end
+
+          it 'will not appear in the duration chart dropdown' do
+            toggle_duration_chart_dropdown
+
+            expect(duration_chart_stages).not_to include("Issue")
+          end
+        end
+      end
     end
 
     context 'not enabled' do