diff --git a/config/client.go b/config/client.go index a933e5e832..f0558047e7 100644 --- a/config/client.go +++ b/config/client.go @@ -56,6 +56,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["ExperimentalEnableClickToReply"] = strconv.FormatBool(*c.ExperimentalSettings.EnableClickToReply) props["ExperimentalCloudBilling"] = strconv.FormatBool(*c.ExperimentalSettings.CloudBilling) + props["EnableAppBar"] = strconv.FormatBool(*c.ExperimentalSettings.EnableAppBar) props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies) props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone) diff --git a/model/config.go b/model/config.go index 90b963b996..ccc07c324f 100644 --- a/model/config.go +++ b/model/config.go @@ -949,6 +949,7 @@ type ExperimentalSettings struct { 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() { @@ -987,6 +988,10 @@ func (s *ExperimentalSettings) SetDefaults() { if s.EnableRemoteClusterService == nil { s.EnableRemoteClusterService = NewBool(false) } + + if s.EnableAppBar == nil { + s.EnableAppBar = NewBool(false) + } } type AnalyticsSettings struct { diff --git a/model/feature_flags.go b/model/feature_flags.go index 6cb2e79674..40dd73c14a 100644 --- a/model/feature_flags.go +++ b/model/feature_flags.go @@ -25,9 +25,6 @@ type FeatureFlags struct { // AppsEnabled toggles the Apps framework functionalities both in server and client side AppsEnabled bool - // AppBarEnabled toggles the App Bar component on client side - AppBarEnabled bool - // Feature flags to control plugin versions PluginPlaybooks string `plugin_id:"playbooks"` PluginApps string `plugin_id:"com.mattermost.apps"` @@ -81,7 +78,6 @@ func (f *FeatureFlags) SetDefaults() { f.CollapsedThreads = true f.EnableRemoteClusterService = false f.AppsEnabled = true - f.AppBarEnabled = false f.PluginApps = "" f.PluginFocalboard = "" f.PermalinkPreviews = true diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 06f3142409..9d719ac357 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -718,6 +718,7 @@ func (ts *TelemetryService) trackConfig() { "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]interface{}{