diff options
Diffstat (limited to 'app/helpers/user_callouts_helper.rb')
-rw-r--r-- | app/helpers/user_callouts_helper.rb | 49 |
1 files changed, 47 insertions, 2 deletions
diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index f5a74a3f57d..2c3dc243d85 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -9,6 +9,7 @@ module UserCalloutsHelper FEATURE_FLAGS_NEW_VERSION = 'feature_flags_new_version' REGISTRATION_ENABLED_CALLOUT = 'registration_enabled_callout' UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout' + INVITE_MEMBERS_BANNER = 'invite_members_banner' def show_gke_cluster_integration_callout?(project) active_nav_link?(controller: sidebar_operations_paths) && @@ -27,7 +28,7 @@ module UserCalloutsHelper def render_dashboard_ultimate_trial(user) end - def render_account_recovery_regular_check + def render_two_factor_auth_recovery_settings_check end def show_suggest_popover? @@ -53,7 +54,14 @@ module UserCalloutsHelper !user_dismissed?(REGISTRATION_ENABLED_CALLOUT) end - def dismiss_account_recovery_regular_check + def dismiss_two_factor_auth_recovery_settings_check + end + + def show_invite_banner?(group) + Ability.allowed?(current_user, :admin_group, group) && + !just_created? && + !user_dismissed_for_group(INVITE_MEMBERS_BANNER, group) && + !multiple_members?(group) end private @@ -63,6 +71,43 @@ module UserCalloutsHelper current_user.dismissed_callout?(feature_name: feature_name, ignore_dismissal_earlier_than: ignore_dismissal_earlier_than) end + + def user_dismissed_for_group(feature_name, group, ignore_dismissal_earlier_than = nil) + return false unless current_user + + set_dismissed_from_cookie(group) + + current_user.dismissed_callout_for_group?(feature_name: feature_name, + group: group, + ignore_dismissal_earlier_than: ignore_dismissal_earlier_than) + end + + def set_dismissed_from_cookie(group) + # bridge function for one milestone to try and not annoy users who might have already dismissed this alert + # remove in 14.4 or 14.5? https://gitlab.com/gitlab-org/gitlab/-/issues/340322 + dismissed_key = "invite_#{group.id}_#{current_user.id}" + + if cookies[dismissed_key].present? + params = { + feature_name: INVITE_MEMBERS_BANNER, + group_id: group.id + } + + Users::DismissGroupCalloutService.new( + container: nil, current_user: current_user, params: params + ).execute + + cookies.delete dismissed_key + end + end + + def just_created? + flash[:notice]&.include?('successfully created') + end + + def multiple_members?(group) + group.member_count > 1 || group.members_with_parents.count > 1 + end end UserCalloutsHelper.prepend_mod |