From 8bfe24c7740f604a8c607ff1ac09ed989f6128e3 Mon Sep 17 00:00:00 2001 From: Allan Guwatudde Date: Mon, 9 Aug 2021 08:56:10 +0300 Subject: [PATCH] [MM-37578] - Add setting for onboarding (#18068) * [MM-37578] - Add setting for onboarding * fix lint Co-authored-by: Mattermod --- config/client.go | 1 + model/config.go | 5 +++++ services/telemetry/telemetry.go | 1 + tests/test-config.json | 1 + 4 files changed, 8 insertions(+) diff --git a/config/client.go b/config/client.go index a758880f25..51f990f763 100644 --- a/config/client.go +++ b/config/client.go @@ -42,6 +42,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages) props["EnablePreviewFeatures"] = strconv.FormatBool(*c.ServiceSettings.EnablePreviewFeatures) props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial) + props["EnableOnboardingFlow"] = strconv.FormatBool(*c.ServiceSettings.EnableOnboardingFlow) props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages) props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels props["EnableSVGs"] = strconv.FormatBool(*c.ServiceSettings.EnableSVGs) diff --git a/model/config.go b/model/config.go index 9b3b35b07d..a0da8364c0 100644 --- a/model/config.go +++ b/model/config.go @@ -348,6 +348,7 @@ type ServiceSettings struct { CloseUnusedDirectMessages *bool `access:"experimental_features"` EnablePreviewFeatures *bool `access:"experimental_features"` EnableTutorial *bool `access:"experimental_features"` + EnableOnboardingFlow *bool `access:"experimental_features"` ExperimentalEnableDefaultChannelLeaveJoinMessages *bool `access:"experimental_features"` ExperimentalGroupUnreadChannels *string `access:"experimental_features"` ExperimentalChannelOrganization *bool `access:"experimental_features"` @@ -578,6 +579,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { s.EnableTutorial = NewBool(true) } + if s.EnableOnboardingFlow == nil { + s.EnableOnboardingFlow = NewBool(true) + } + // Must be manually enabled for existing installations. if s.ExtendSessionLengthWithActivity == nil { s.ExtendSessionLengthWithActivity = NewBool(!isUpdate) diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 78f590e949..377cae60b4 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -418,6 +418,7 @@ func (ts *TelemetryService) trackConfig() { "close_unused_direct_messages": *cfg.ServiceSettings.CloseUnusedDirectMessages, "enable_preview_features": *cfg.ServiceSettings.EnablePreviewFeatures, "enable_tutorial": *cfg.ServiceSettings.EnableTutorial, + "enable_onboarding_flow": *cfg.ServiceSettings.EnableOnboardingFlow, "experimental_enable_default_channel_leave_join_messages": *cfg.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages, "experimental_group_unread_channels": *cfg.ServiceSettings.ExperimentalGroupUnreadChannels, "collapsed_threads": *cfg.ServiceSettings.CollapsedThreads, diff --git a/tests/test-config.json b/tests/test-config.json index 01cb7a0ec7..3926ddf864 100644 --- a/tests/test-config.json +++ b/tests/test-config.json @@ -59,6 +59,7 @@ "CloseUnusedDirectMessages": false, "EnablePreviewFeatures": true, "EnableTutorial": true, + "EnableOnboardingFlow": true, "ExperimentalEnableDefaultChannelLeaveJoinMessages": true, "ExperimentalGroupUnreadChannels": "disabled", "ImageProxyType": "",