[MM-45684] - Self Managed: Add pricing modal + Upgrade button (#20653)

Этот коммит содержится в:
Allan Guwatudde
2022-07-18 18:46:32 +03:00
коммит произвёл GitHub
родитель 14dbe2a030
Коммит 01fce41bd7
3 изменённых файлов: 25 добавлений и 18 удалений

Просмотреть файл

@@ -56,6 +56,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
props["ExperimentalCloudBilling"] = strconv.FormatBool(*c.ExperimentalSettings.CloudBilling) props["ExperimentalCloudBilling"] = strconv.FormatBool(*c.ExperimentalSettings.CloudBilling)
props["EnableAppBar"] = strconv.FormatBool(*c.ExperimentalSettings.EnableAppBar) props["EnableAppBar"] = strconv.FormatBool(*c.ExperimentalSettings.EnableAppBar)
props["EnableUpgradeForSelfHostedStarter"] = strconv.FormatBool(*c.ExperimentalSettings.EnableUpgradeForSelfHostedStarter)
props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies) props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies)
props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone) props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone)

Просмотреть файл

@@ -949,6 +949,7 @@ type ExperimentalSettings struct {
EnableSharedChannels *bool `access:"experimental_features"` EnableSharedChannels *bool `access:"experimental_features"`
EnableRemoteClusterService *bool `access:"experimental_features"` EnableRemoteClusterService *bool `access:"experimental_features"`
EnableAppBar *bool `access:"experimental_features"` EnableAppBar *bool `access:"experimental_features"`
EnableUpgradeForSelfHostedStarter *bool `access:"experimental_features"`
} }
func (s *ExperimentalSettings) SetDefaults() { func (s *ExperimentalSettings) SetDefaults() {
@@ -987,6 +988,10 @@ func (s *ExperimentalSettings) SetDefaults() {
if s.EnableAppBar == nil { if s.EnableAppBar == nil {
s.EnableAppBar = NewBool(false) s.EnableAppBar = NewBool(false)
} }
if s.EnableUpgradeForSelfHostedStarter == nil {
s.EnableUpgradeForSelfHostedStarter = NewBool(true)
}
} }
type AnalyticsSettings struct { type AnalyticsSettings struct {

Просмотреть файл

@@ -729,6 +729,7 @@ func (ts *TelemetryService) trackConfig() {
"enable_shared_channels": *cfg.ExperimentalSettings.EnableSharedChannels, "enable_shared_channels": *cfg.ExperimentalSettings.EnableSharedChannels,
"enable_remote_cluster_service": *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService, "enable_remote_cluster_service": *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService,
"enable_app_bar": *cfg.ExperimentalSettings.EnableAppBar, "enable_app_bar": *cfg.ExperimentalSettings.EnableAppBar,
"enable_upgrade_for_self_hosted_starter": *cfg.ExperimentalSettings.EnableUpgradeForSelfHostedStarter,
}) })
ts.SendTelemetry(TrackConfigAnalytics, map[string]any{ ts.SendTelemetry(TrackConfigAnalytics, map[string]any{