Merge branch '457265-fix-widget-props' into 'master'

Only include the duo pro widget data if ultimate trial is absent

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153207



Merged-by: Nicolas Dular <ndular@gitlab.com>
Approved-by: Serhii Yarynovskyi <syarynovskyi@gitlab.com>
Approved-by: Nicolas Dular <ndular@gitlab.com>
Reviewed-by: Nicolas Dular <ndular@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>

ee/app/helpers/ee/sidebars_helper.rb

@@ -39,9 +39,12 @@ def super_sidebar_context(user, group:, project:, panel:, panel_type:)
 
       context.merge!(
         trial_data(root_namespace),
-        duo_pro_trial_data(root_namespace),
         show_tanuki_bot: ::Gitlab::Llm::TanukiBot.enabled_for?(user: current_user, container: nil)
       )
+
+      # do not add overriding data if there is already an ultimate trial widget to show
+      context.merge!(duo_pro_trial_data(root_namespace)) unless context.key?(:trial_status_widget_data_attrs)
+
       context[:trial] = {
         has_start_trial: trials_allowed?(user),
         url: new_trial_path(glm_source: 'gitlab.com', glm_content: 'top-right-dropdown')

ee/spec/features/trials/trial_widget_in_sidebar_spec.rb

@@ -8,13 +8,21 @@
   let_it_be(:user) { create(:user, :with_namespace, organization: 'YMCA') }
   let_it_be(:group) do
     create(
-      :group_with_plan, plan: :ultimate_trial_plan, trial_starts_on: Date.current, trial_ends_on: 30.days.from_now
-    ) do |record|
-      record.add_owner(user)
-    end
+      :group_with_plan,
+      plan: :ultimate_trial_plan,
+      trial_starts_on: Date.current,
+      trial_ends_on: 30.days.from_now,
+      owners: user
+    )
+  end
+
+  before_all do
+    # Setup a duo pro trial here too so that we ensure ultimate trial widget is unaffected
+    create(:gitlab_subscription_add_on_purchase, :gitlab_duo_pro, :trial, namespace: group)
   end
 
   before do
+    stub_saas_features(subscriptions_trials: true)
     stub_application_setting(check_namespace_plan: true)
     allow_next_instance_of(GitlabSubscriptions::FetchSubscriptionPlansService, plan: :free) do |instance|
       allow(instance).to receive(:execute).and_return([{ 'code' => 'ultimate', 'id' => 'ultimate-plan-id' }])

ee/spec/helpers/sidebars_helper_spec.rb

@@ -134,6 +134,19 @@
 
           it { is_expected.to include(:duo_pro_trial_status_widget_data_attrs) }
           it { is_expected.to include(:duo_pro_trial_status_popover_data_attrs) }
+
+          context 'when a namespace is also qualified for a trial status widget' do
+            before do
+              allow(helper).to receive(:can?).with(user, :admin_namespace, namespace).and_return(true)
+              stub_ee_application_setting(should_check_namespace_plan: true)
+              allow(helper).to receive(:show_trial_status_widget?).and_return(true)
+            end
+
+            it { is_expected.to include(:trial_status_widget_data_attrs) }
+            it { is_expected.to include(:trial_status_popover_data_attrs) }
+            it { is_expected.not_to include(:duo_pro_trial_status_widget_data_attrs) }
+            it { is_expected.not_to include(:duo_pro_trial_status_popover_data_attrs) }
+          end
         end
       end
     end