mirror of
https://github.com/mattermost/mattermost.git
synced 2026-04-13 13:08:56 -04:00
* Add single-channel guest tracking and reporting - Add AnalyticsGetSingleChannelGuestCount store method to count guests in exactly one channel - Exclude single-channel guests from active user seat count in GetServerLimits - Add single-channel guest count to standard analytics response - Add Single-channel Guests card to System Statistics page with overage warning - Add Single-channel guests row to Edition and License page with overage styling - Add dismissible admin-only banner when single-channel guest limit is exceeded - Gate feature behind non-Entry SKU and guest accounts enabled checks - Re-fetch server limits on config changes for reactive UI updates - Fix label alignment in license details panel Made-with: Cursor * Refine single-channel guest tracking - Remove license GuestAccounts feature check from shouldTrackSingleChannelGuests (only config matters) - Re-add getServerLimits calls on page mount for fresh data - Remove config-change reactivity code (componentDidUpdate, useEffect) - Add server i18n translations for error strings - Sync webapp i18n via extract - Add inline comments for business logic - Restore struct field comments in ServerLimits model - Add Playwright E2E tests for single-channel guest feature - Fix label alignment in license details panel Made-with: Cursor * Guests over limit fixes and PR feedback * Fix linter issues and code quality improvements - Use max() builtin to clamp adjusted user count instead of if-statement (modernize linter) - Change banner type from ADVISOR to CRITICAL for proper red color styling Made-with: Cursor * Fix overage warnings incorrectly counting single-channel guests Single-channel guests are free and should not trigger license seat overage warnings. Update all overage checks to use serverLimits.activeUserCount (seat-adjusted, excluding SCG) instead of the raw total_users_count or TOTAL_USERS analytics stat. - UserSeatAlertBanner on License page: use serverLimits.activeUserCount - UserSeatAlertBanner on Site Statistics page: use serverLimits.activeUserCount - ActivatedUserCard display and overage check: use serverLimits.activeUserCount - OverageUsersBanner: use serverLimits.activeUserCount Made-with: Cursor * Use license.Users as fallback for singleChannelGuestLimit before limits load This prevents the SingleChannelGuestsCard from showing a false overage state before serverLimits has been fetched, while still rendering the card immediately on page load. Made-with: Cursor * Fix invite modal overage banner incorrectly counting single-channel guests Made-with: Cursor * Fix invitation modal tests missing limits entity in mock state Made-with: Cursor * Fix tests * Add E2E test for single-channel guest exceeded limit scenario Made-with: Cursor * Fix TypeScript errors in single channel guests E2E test Made-with: Cursor * Fix channel name validation error caused by unawaited async getRandomId() Made-with: Cursor * Add contextual tooltips to stat cards when guest accounts are enabled Made-with: Cursor * Code review feedback: query builder, readability, tooltips, and alignment fixes Made-with: Cursor * Fix license page tooltip alignment, width, and SaveLicense SCG exclusion Made-with: Cursor * Fix banner dismiss, license spacing, and add dismiss test Made-with: Cursor * Exclude DM/GM channels from single-channel guest count and fix E2E tests Filter the AnalyticsGetSingleChannelGuestCount query to only count memberships in public/private channels, excluding DMs and GMs. Update store tests with DM-only, GM-only, and mixed membership cases. Fix E2E overage test to mock the server limits API instead of skipping, and correct banner locator to use data-testid. Made-with: Cursor
112 lines
3.4 KiB
Go
112 lines
3.4 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package app
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
)
|
|
|
|
const (
|
|
maxUsersLimit = 200
|
|
maxUsersHardLimit = 250
|
|
)
|
|
|
|
func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
|
|
limits := &model.ServerLimits{}
|
|
license := a.License()
|
|
|
|
if license == nil && maxUsersLimit > 0 {
|
|
// Enforce hard-coded limits for unlicensed servers (no grace period).
|
|
limits.MaxUsersLimit = maxUsersLimit
|
|
limits.MaxUsersHardLimit = maxUsersHardLimit
|
|
} else if license != nil && license.IsSeatCountEnforced && license.Features != nil && license.Features.Users != nil {
|
|
// Enforce license limits as required by the license with configurable extra users.
|
|
licenseUserLimit := int64(*license.Features.Users)
|
|
limits.MaxUsersLimit = licenseUserLimit
|
|
|
|
// Use ExtraUsers if configured, otherwise default to 0 (no extra users)
|
|
extraUsers := 0
|
|
if license.ExtraUsers != nil {
|
|
extraUsers = *license.ExtraUsers
|
|
}
|
|
|
|
limits.MaxUsersHardLimit = licenseUserLimit + int64(extraUsers)
|
|
}
|
|
|
|
// Check if license has post history limits and get the calculated timestamp
|
|
if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 {
|
|
limits.PostHistoryLimit = license.Limits.PostHistory
|
|
// Get the calculated timestamp of the last accessible post
|
|
lastAccessibleTime, appErr := a.GetLastAccessiblePostTime()
|
|
if appErr != nil {
|
|
return nil, appErr
|
|
}
|
|
limits.LastAccessiblePostTime = lastAccessibleTime
|
|
}
|
|
|
|
activeUserCount, appErr := a.Srv().Store().User().Count(model.UserCountOptions{})
|
|
if appErr != nil {
|
|
return nil, model.NewAppError("GetServerLimits", "app.limits.get_app_limits.user_count.store_error", nil, "", http.StatusInternalServerError).Wrap(appErr)
|
|
}
|
|
|
|
if a.shouldTrackSingleChannelGuests() {
|
|
singleChannelGuestCount, err := a.Srv().Store().User().AnalyticsGetSingleChannelGuestCount()
|
|
if err != nil {
|
|
return nil, model.NewAppError("GetServerLimits", "app.limits.get_app_limits.single_channel_guest_count.store_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
|
}
|
|
|
|
// Single-channel guests are free and excluded from the primary seat count.
|
|
limits.ActiveUserCount = max(activeUserCount-singleChannelGuestCount, 0)
|
|
limits.SingleChannelGuestCount = singleChannelGuestCount
|
|
// Guests are allowed up to a 1:1 ratio with licensed seats.
|
|
if license != nil && license.Features != nil && license.Features.Users != nil {
|
|
limits.SingleChannelGuestLimit = int64(*license.Features.Users)
|
|
}
|
|
} else {
|
|
limits.ActiveUserCount = activeUserCount
|
|
}
|
|
|
|
return limits, nil
|
|
}
|
|
|
|
func (a *App) shouldTrackSingleChannelGuests() bool {
|
|
license := a.License()
|
|
if license == nil {
|
|
return false
|
|
}
|
|
if license.IsMattermostEntry() {
|
|
return false
|
|
}
|
|
cfg := a.Config()
|
|
if cfg == nil || cfg.GuestAccountsSettings.Enable == nil {
|
|
return false
|
|
}
|
|
|
|
return *cfg.GuestAccountsSettings.Enable
|
|
}
|
|
|
|
func (a *App) GetPostHistoryLimit() int64 {
|
|
license := a.License()
|
|
if license == nil || license.Limits == nil || license.Limits.PostHistory == 0 {
|
|
// No limits applicable
|
|
return 0
|
|
}
|
|
|
|
return license.Limits.PostHistory
|
|
}
|
|
|
|
func (a *App) isAtUserLimit() (bool, *model.AppError) {
|
|
userLimits, appErr := a.GetServerLimits()
|
|
if appErr != nil {
|
|
return false, appErr
|
|
}
|
|
|
|
if userLimits.MaxUsersHardLimit == 0 {
|
|
return false, nil
|
|
}
|
|
|
|
return userLimits.ActiveUserCount >= userLimits.MaxUsersHardLimit, appErr
|
|
}
|