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

This reverts commit 01fce41bd7.

config/client.go

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

model/config.go

@@ -940,16 +940,15 @@ func (s *MetricsSettings) SetDefaults() {
 }
 
 type ExperimentalSettings struct {
-	ClientSideCertEnable              *bool   `access:"experimental_features,cloud_restrictable"`
-	ClientSideCertCheck               *string `access:"experimental_features,cloud_restrictable"`
-	LinkMetadataTimeoutMilliseconds   *int64  `access:"experimental_features,write_restrictable,cloud_restrictable"`
-	RestrictSystemAdmin               *bool   `access:"experimental_features,write_restrictable"`
-	UseNewSAMLLibrary                 *bool   `access:"experimental_features,cloud_restrictable"`
-	CloudBilling                      *bool   `access:"experimental_features,write_restrictable"`
-	EnableSharedChannels              *bool   `access:"experimental_features"`
-	EnableRemoteClusterService        *bool   `access:"experimental_features"`
-	EnableAppBar                      *bool   `access:"experimental_features"`
-	EnableUpgradeForSelfHostedStarter *bool   `access:"experimental_features"`
+	ClientSideCertEnable            *bool   `access:"experimental_features,cloud_restrictable"`
+	ClientSideCertCheck             *string `access:"experimental_features,cloud_restrictable"`
+	LinkMetadataTimeoutMilliseconds *int64  `access:"experimental_features,write_restrictable,cloud_restrictable"`
+	RestrictSystemAdmin             *bool   `access:"experimental_features,write_restrictable"`
+	UseNewSAMLLibrary               *bool   `access:"experimental_features,cloud_restrictable"`
+	CloudBilling                    *bool   `access:"experimental_features,write_restrictable"`
+	EnableSharedChannels            *bool   `access:"experimental_features"`
+	EnableRemoteClusterService      *bool   `access:"experimental_features"`
+	EnableAppBar                    *bool   `access:"experimental_features"`
 }
 
 func (s *ExperimentalSettings) SetDefaults() {
@@ -988,10 +987,6 @@ func (s *ExperimentalSettings) SetDefaults() {
 	if s.EnableAppBar == nil {
 		s.EnableAppBar = NewBool(false)
 	}
-
-	if s.EnableUpgradeForSelfHostedStarter == nil {
-		s.EnableUpgradeForSelfHostedStarter = NewBool(true)
-	}
 }
 
 type AnalyticsSettings struct {

services/telemetry/telemetry.go

@@ -720,16 +720,15 @@ func (ts *TelemetryService) trackConfig() {
 	})
 
 	ts.SendTelemetry(TrackConfigExperimental, map[string]any{
-		"client_side_cert_enable":                *cfg.ExperimentalSettings.ClientSideCertEnable,
-		"isdefault_client_side_cert_check":       isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.ClientSideCertCheckPrimaryAuth),
-		"link_metadata_timeout_milliseconds":     *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds,
-		"restrict_system_admin":                  *cfg.ExperimentalSettings.RestrictSystemAdmin,
-		"use_new_saml_library":                   *cfg.ExperimentalSettings.UseNewSAMLLibrary,
-		"cloud_billing":                          *cfg.ExperimentalSettings.CloudBilling,
-		"enable_shared_channels":                 *cfg.ExperimentalSettings.EnableSharedChannels,
-		"enable_remote_cluster_service":          *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService,
-		"enable_app_bar":                         *cfg.ExperimentalSettings.EnableAppBar,
-		"enable_upgrade_for_self_hosted_starter": *cfg.ExperimentalSettings.EnableUpgradeForSelfHostedStarter,
+		"client_side_cert_enable":            *cfg.ExperimentalSettings.ClientSideCertEnable,
+		"isdefault_client_side_cert_check":   isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.ClientSideCertCheckPrimaryAuth),
+		"link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds,
+		"restrict_system_admin":              *cfg.ExperimentalSettings.RestrictSystemAdmin,
+		"use_new_saml_library":               *cfg.ExperimentalSettings.UseNewSAMLLibrary,
+		"cloud_billing":                      *cfg.ExperimentalSettings.CloudBilling,
+		"enable_shared_channels":             *cfg.ExperimentalSettings.EnableSharedChannels,
+		"enable_remote_cluster_service":      *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService,
+		"enable_app_bar":                     *cfg.ExperimentalSettings.EnableAppBar,
 	})
 
 	ts.SendTelemetry(TrackConfigAnalytics, map[string]any{