diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js
index 120c71273fae941e40f032e8842981c6b06e0032..7e996223f9ed033c00dad856f34e31224001b76d 100644
--- a/app/assets/javascripts/persistent_user_callouts.js
+++ b/app/assets/javascripts/persistent_user_callouts.js
@@ -26,6 +26,7 @@ const PERSISTENT_USER_CALLOUTS = [
'.js-joining-a-project-alert',
'.js-duo-pro-trial-alert',
'.js-duo-chat-ga-alert',
+ '.js-all-seats-used',
];
const initCallouts = () => {
diff --git a/app/models/users/group_callout.rb b/app/models/users/group_callout.rb
index 74b653b57776d3b5972521da276842e41c3e46d7..5dc5140f386b6a555ef4a520bc4f6772b0f3ce05 100644
--- a/app/models/users/group_callout.rb
+++ b/app/models/users/group_callout.rb
@@ -30,7 +30,8 @@ class GroupCallout < ApplicationRecord
project_repository_limit_alert_warning_threshold: 20, # EE-only
project_repository_limit_alert_alert_threshold: 21, # EE-only
project_repository_limit_alert_error_threshold: 22, # EE-only
- namespace_over_storage_users_combined_alert: 23 # EE-only
+ namespace_over_storage_users_combined_alert: 23, # EE-only
+ all_seats_used_alert: 24 # EE-only
}
validates :group, presence: true
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index d854190b73454cf92278bd4e6a8d6de109d7b856..f4428f1ccc7c7ae80132d193b866da6b58a575ed 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,6 +1,7 @@
.layout-page{ class: page_with_sidebar_class }
-# Render the parent group sidebar while creating a new subgroup/project, see GroupsController#new.
- group = @parent_group || @group
+ - context = group || @project
- sidebar_panel = super_sidebar_nav_panel(nav: nav, user: current_user, group: group, project: @project, current_ref: current_ref, ref_type: @ref_type, viewed_user: @user, organization: @organization)
- sidebar_data = super_sidebar_context(current_user, group: group, project: @project, panel: sidebar_panel, panel_type: nav).to_json
@@ -28,6 +29,7 @@
= dispensable_render "shared/service_ping_consent"
= dispensable_render_if_exists "layouts/header/ee_subscribable_banner"
= dispensable_render_if_exists "layouts/header/seat_count_alert"
+ = dispensable_render_if_exists "layouts/header/all_seats_used_alert", context: context
= dispensable_render_if_exists "shared/namespace_user_cap_reached_alert"
= dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert"
= dispensable_render_if_exists "shared/silent_mode_banner"
diff --git a/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.html.haml b/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..d4e99d6b33211f89ed68f5e40e734fc5410afe7e
--- /dev/null
+++ b/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.html.haml
@@ -0,0 +1,13 @@
+%div{ class: [@content_class, 'gl-pt-5!'] }
+ = render Pajamas::AlertComponent.new(alert_options: { class: 'js-all-seats-used',
+ data: { dismiss_endpoint: group_callouts_path,
+ feature_id: EE::Users::GroupCalloutsHelper::ALL_SEATS_USED_ALERT,
+ group_id: root_namespace.id,
+ testid: 'all-seats-used-alert' }},
+ title: _('No more seats in subscription'),
+ variant: :warning) do |c|
+ - c.with_body do
+ %p= _('Your namespace has used all the seats in your subscription and users can no longer be invited or added to the namespace.')
+ - c.with_actions do
+ = render Pajamas::ButtonComponent.new(variant: :confirm, href: help_page_path('subscriptions/gitlab_com/index', anchor: 'add-seats-to-your-subscription')) do
+ = s_('Purchase more seats')
diff --git a/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.rb b/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.rb
new file mode 100644
index 0000000000000000000000000000000000000000..23e986bc5c2b3f0b908676ba807223e38064e0a9
--- /dev/null
+++ b/ee/app/components/namespaces/block_seat_overages/all_seats_used_alert_component.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Namespaces
+ module BlockSeatOverages
+ class AllSeatsUsedAlertComponent < ViewComponent::Base
+ def initialize(context:, content_class:, current_user:)
+ @root_namespace = context&.root_ancestor
+ @content_class = content_class
+ @current_user = current_user
+ end
+
+ attr_reader :root_namespace, :content_class, :current_user
+
+ def render?
+ return false unless group_namespace? && owner? && block_seat_overages? && !user_dismissed_alert?
+
+ all_seats_used?
+ end
+
+ private
+
+ def group_namespace?
+ root_namespace&.group_namespace?
+ end
+
+ def block_seat_overages?
+ subscription&.has_a_paid_hosted_plan? && root_namespace.block_seat_overages?
+ end
+
+ def subscription
+ root_namespace.gitlab_subscription
+ end
+
+ def owner?
+ Ability.allowed?(current_user, :owner_access, root_namespace)
+ end
+
+ def all_seats_used?
+ billable_members_count = root_namespace.billable_members_count_with_reactive_cache
+
+ return false if billable_members_count.blank?
+
+ # We use `==` here because there is another banner for seat overage
+ subscription.seats == billable_members_count
+ end
+
+ def user_dismissed_alert?
+ current_user.dismissed_callout_for_group?(
+ feature_name: EE::Users::GroupCalloutsHelper::ALL_SEATS_USED_ALERT,
+ group: root_namespace
+ )
+ end
+ end
+ end
+end
diff --git a/ee/app/helpers/ee/users/group_callouts_helper.rb b/ee/app/helpers/ee/users/group_callouts_helper.rb
index 87a72d79585960c99868c5efab1333a1c6b3d084..066fa4d33a414402bfd5ccbe80e5e158cebc2703 100644
--- a/ee/app/helpers/ee/users/group_callouts_helper.rb
+++ b/ee/app/helpers/ee/users/group_callouts_helper.rb
@@ -4,6 +4,7 @@ module EE
module Users
module GroupCalloutsHelper
UNLIMITED_MEMBERS_DURING_TRIAL_ALERT = 'unlimited_members_during_trial_alert'
+ ALL_SEATS_USED_ALERT = 'all_seats_used_alert'
def show_unlimited_members_during_trial_alert?(group)
::Namespaces::FreeUserCap::Enforcement.new(group).qualified_namespace? &&
diff --git a/ee/app/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service.rb b/ee/app/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service.rb
index 6c895cebfe75ad2fd9379153b8c1c6fa77534793..3980426b57b057d64f821ef451bdef2b4d08d182 100644
--- a/ee/app/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service.rb
+++ b/ee/app/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-#
+
module GitlabSubscriptions
module Reconciliations
class CalculateSeatCountDataService
diff --git a/ee/app/views/layouts/header/_all_seats_used_alert.html.haml b/ee/app/views/layouts/header/_all_seats_used_alert.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..b54114bda9a93bc31403eba45414d8c88e4fa927
--- /dev/null
+++ b/ee/app/views/layouts/header/_all_seats_used_alert.html.haml
@@ -0,0 +1 @@
+= render Namespaces::BlockSeatOverages::AllSeatsUsedAlertComponent.new(context: context, content_class: full_content_class, current_user: current_user)
diff --git a/ee/spec/components/namespaces/block_seat_overages/all_seats_used_alert_component_spec.rb b/ee/spec/components/namespaces/block_seat_overages/all_seats_used_alert_component_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b56bd974c6c68c9466d6387efedb61fd6a0956f5
--- /dev/null
+++ b/ee/spec/components/namespaces/block_seat_overages/all_seats_used_alert_component_spec.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Namespaces::BlockSeatOverages::AllSeatsUsedAlertComponent, type: :component, feature_category: :consumables_cost_management do
+ include ReactiveCachingHelpers
+
+ let_it_be(:current_user) { build(:user) }
+ let_it_be(:namespace) { build(:group) }
+
+ let(:billable_members_count) { 2 }
+ let(:permission_owner) { true }
+
+ before do
+ allow(namespace).to receive(:billable_members_count).and_return(billable_members_count)
+ allow(Ability).to receive(:allowed?).with(current_user, :owner_access, namespace).and_return(permission_owner)
+
+ build(:gitlab_subscription, namespace: namespace, plan_code: Plan::ULTIMATE, seats: 2)
+ end
+
+ describe '#render?' do
+ subject { component.render? }
+
+ before do
+ allow(current_user).to receive(:dismissed_callout_for_group?).and_return(false)
+ end
+
+ context 'in a saas environment', :saas do
+ context 'with a reactive cache hit' do
+ before do
+ synchronous_reactive_cache(namespace)
+ end
+
+ describe 'when user has dismissed alert' do
+ before do
+ allow(current_user).to receive(:dismissed_callout_for_group?).and_return(true)
+ end
+
+ it { is_expected.to be false }
+ end
+
+ describe 'when namespace has no paid plan' do
+ before do
+ build(:gitlab_subscription, namespace: namespace, plan_code: Plan::FREE)
+ end
+
+ it { is_expected.to be false }
+ end
+
+ describe 'when user is not a owner' do
+ let(:permission_owner) { false }
+
+ it { is_expected.to be false }
+ end
+
+ describe 'when block seats overages is false' do
+ before do
+ stub_feature_flags(block_seat_overages: false)
+ end
+
+ it { is_expected.to be false }
+ end
+
+ describe 'with no billable members' do
+ let(:billable_members_count) { 0 }
+
+ it { is_expected.to be false }
+ end
+
+ describe 'when namespace is personal' do
+ let_it_be(:namespace) { build(:user).namespace }
+
+ it { is_expected.to be false }
+ end
+
+ it { is_expected.to be true }
+ end
+
+ context 'with a reactive cache miss' do
+ before do
+ stub_reactive_cache(namespace, nil)
+ end
+
+ it { is_expected.to be false }
+ end
+ end
+ end
+
+ def component(context = namespace)
+ described_class.new(context: context, content_class: '', current_user: current_user)
+ end
+end
diff --git a/ee/spec/features/groups/group_overview_spec.rb b/ee/spec/features/groups/group_overview_spec.rb
index 3fcc6c4f85151034fa7c7101625685ae919b9257..ea23d3fcb2eeb0a4bc0bea873b455e348909a6cc 100644
--- a/ee/spec/features/groups/group_overview_spec.rb
+++ b/ee/spec/features/groups/group_overview_spec.rb
@@ -4,6 +4,7 @@
RSpec.describe 'Group information', :js, :aggregate_failures, feature_category: :groups_and_projects do
include BillableMembersHelpers
+ using RSpec::Parameterized::TableSyntax
let_it_be(:user) { create(:user) }
let_it_be(:group) { create(:group) }
@@ -45,8 +46,8 @@
page.within(find('.content')) do
expect(page).to have_content s_("SecurityReports|Either you don't have permission to view this dashboard or "\
- 'the dashboard has not been setup. Please check your permission settings '\
- 'with your administrator or check your dashboard configurations to proceed.')
+ 'the dashboard has not been setup. Please check your permission settings '\
+ 'with your administrator or check your dashboard configurations to proceed.')
end
end
end
@@ -92,6 +93,75 @@
it_behaves_like 'over the free user limit alert'
end
+ context 'with all seats used alert', :saas, :use_clean_rails_memory_store_caching do
+ context 'when all seats are used' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :premium, namespace: group, seats: 1) }
+
+ before do
+ stub_billable_members_reactive_cache(group)
+ end
+
+ context 'when the user is an owner' do
+ it 'displays the all seats used alert' do
+ visit_page
+
+ expect(page).to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+
+ within_testid('all-seats-used-alert') do
+ expect(page).to have_css('[data-testid="close-icon"]')
+ expect(page).to have_text "No more seats in subscription"
+ expect(page).to have_text "Your namespace has used all the seats in your subscription and users can " \
+ "no longer be invited or added to the namespace."
+ expect(page).to have_link 'Purchase more seats', href:
+ help_page_path('subscriptions/gitlab_com/index', anchor: 'add-seats-to-your-subscription')
+ end
+ end
+
+ context 'when the user is not an owner' do
+ where(:role) do
+ ::Gitlab::Access.sym_options.keys.map(&:to_sym)
+ end
+
+ with_them do
+ it 'does not display the all seats used alert' do
+ visit_page
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+ end
+ end
+ end
+
+ context 'when not all seats are used' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :premium, namespace: group, seats: 5) }
+
+ before do
+ stub_billable_members_reactive_cache(group)
+ end
+
+ it 'does not display the all seats used alert' do
+ visit_page
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+
+ context 'with a free plan' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :free, namespace: group, seats: 1) }
+
+ before do
+ stub_billable_members_reactive_cache(group)
+ end
+
+ it 'does not display the all seats used alert' do
+ visit_page
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+ end
+
context 'when there is a seat overage', :saas, :use_clean_rails_memory_store_caching do
let_it_be(:subscription) { create(:gitlab_subscription, :premium, namespace: group, seats: 1) }
@@ -100,8 +170,6 @@
end
before do
- stub_feature_flags(block_seat_overages: true)
-
stub_billable_members_reactive_cache(group)
end
diff --git a/ee/spec/features/projects/show_project_spec.rb b/ee/spec/features/projects/show_project_spec.rb
index 600b5dc669ab5dddcb665fe92307bb70e39a79e4..79316fcd29b5664425019e9104828e3685b30d0f 100644
--- a/ee/spec/features/projects/show_project_spec.rb
+++ b/ee/spec/features/projects/show_project_spec.rb
@@ -143,4 +143,79 @@
expect(page).to have_selector('[data-testid="settings-project-link"]')
end
end
+
+ describe 'all seats used alert', :saas, :use_clean_rails_memory_store_caching do
+ let_it_be(:group) { create(:group) }
+ let_it_be(:project) { create(:project, namespace: group) }
+
+ before do
+ group.add_member(create(:user), GroupMember::DEVELOPER)
+ sign_in(user)
+ end
+
+ context 'when all seats are used' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :premium, namespace: group, seats: 1) }
+
+ context 'when the user is an owner' do
+ before do
+ stub_billable_members_reactive_cache(group)
+
+ group.add_owner(user)
+ end
+
+ it 'displays the all seats used alert' do
+ visit project_path(project)
+
+ expect(page).to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+
+ within_testid('all-seats-used-alert') do
+ expect(page).to have_css('[data-testid="close-icon"]')
+ expect(page).to have_text "No more seats in subscription"
+ expect(page).to have_text "Your namespace has used all the seats in your subscription and users can " \
+ "no longer be invited or added to the namespace."
+ expect(page).to have_link 'Purchase more seats', href:
+ help_page_path('subscriptions/gitlab_com/index', anchor: 'add-seats-to-your-subscription')
+ end
+ end
+ end
+
+ context 'when the user is not an owner' do
+ let(:role) { :developer }
+
+ it 'does not display the all seats used alert' do
+ visit project_path(project)
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+ end
+
+ context 'with a free plan' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :free, namespace: group, seats: 1) }
+
+ before do
+ stub_billable_members_reactive_cache(group)
+ end
+
+ it 'does not display the all seats used alert' do
+ visit project_path(project)
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+
+ context 'when not all seats are used' do
+ let_it_be(:subscription) { create(:gitlab_subscription, :premium, namespace: group, seats: 3) }
+
+ before do
+ stub_billable_members_reactive_cache(group)
+ end
+
+ it 'does not display the all seats used alert' do
+ visit project_path(project)
+
+ expect(page).not_to have_css '[data-testid="all-seats-used-alert"].gl-alert-warning'
+ end
+ end
+ end
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 71287b27e269e846f0bf39a44a55d3d559510b9f..35c680722c9c555684a58d834c97e507ff8abf15 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -33989,6 +33989,9 @@ msgstr ""
msgid "No milestone"
msgstr ""
+msgid "No more seats in subscription"
+msgstr ""
+
msgid "No more than %{max_issues} issues can be updated at the same time"
msgstr ""
@@ -59791,6 +59794,9 @@ msgstr ""
msgid "Your name"
msgstr ""
+msgid "Your namespace has used all the seats in your subscription and users can no longer be invited or added to the namespace."
+msgstr ""
+
msgid "Your namespace storage is full. This merge request cannot be merged. To continue, %{link_start}manage your storage usage%{link_end}."
msgstr ""