MM-52915 - Remove boards product config setting and system console (#23526)

* Remove boards product config setting and system console * create config setting to enable/disable playbooks product * fix to config name * fix typo * remove lingering ProductSettings references * remove lingering ProductSettings references * revert changes to package-lock.json * Revert "revert changes to package-lock.json" This reverts commit 1a7d98ace33a2f639f41ba7a7697689641684fca. * revert changes to package-lock.json * fix build issues * another fix * update webap test * i18n-extract * Revert "i18n-extract" This reverts commit c0a98c74ea1800341b273301d3cdb990bc629bc5. * fix bad i18n-extract * fix bad i18n-extract * fix tests from bad merge * more translation fixes * more translation fixes * updates from self-review --------- Co-authored-by: Mattermost Build <build@mattermost.com>
2023-06-12 10:52:19 -06:00
--- a/server/boards/integrationtests/boardsapp_test.go
+++ b/server/boards/integrationtests/boardsapp_test.go
@@ -76,18 +76,6 @@ func TestSetConfiguration(t *testing.T) {
 		assert.Equal(t, "testId", config.TelemetryID)
 	})

-	t.Run("test enable shared boards", func(t *testing.T) {
-		baseProductSettings := &model.ProductSettings{
-			EnablePublicSharedBoards: &falseRef,
-		}
-
-		mmConfig := baseConfig
-		mmConfig.ProductSettings = *baseProductSettings
-		mmConfig.ProductSettings.EnablePublicSharedBoards = &boolTrue
-		config := server.CreateBoardsConfig(*mmConfig, "", "")
-		assert.Equal(t, true, config.EnablePublicSharedBoards)
-	})
-
 	t.Run("test boards feature flags", func(t *testing.T) {
 		featureFlags := &model.FeatureFlags{
 			TestFeature:        "test",
--- a/server/boards/server/boards_service_util.go
+++ b/server/boards/server/boards_service_util.go
@@ -58,11 +58,6 @@ func CreateBoardsConfig(mmconfig mm_model.Config, baseURL string, serverID strin
 		enableTelemetry = *mmconfig.LogSettings.EnableDiagnostics
 	}

-	enablePublicSharedBoards := false
-	if mmconfig.ProductSettings.EnablePublicSharedBoards != nil {
-		enablePublicSharedBoards = *mmconfig.ProductSettings.EnablePublicSharedBoards
-	}
-
 	enableBoardsDeletion := false
 	if mmconfig.DataRetentionSettings.EnableBoardsDeletion != nil {
 		enableBoardsDeletion = true
@@ -81,36 +76,35 @@ func CreateBoardsConfig(mmconfig mm_model.Config, baseURL string, serverID strin
 	}

 	return &config.Configuration{
-		ServerRoot:               baseURL + "/boards",
-		Port:                     -1,
-		DBType:                   *mmconfig.SqlSettings.DriverName,
-		DBConfigString:           *mmconfig.SqlSettings.DataSource,
-		DBTablePrefix:            "focalboard_",
-		UseSSL:                   false,
-		SecureCookie:             true,
-		WebPath:                  path.Join(*mmconfig.PluginSettings.Directory, "focalboard", "pack"),
-		FilesDriver:              *mmconfig.FileSettings.DriverName,
-		FilesPath:                *mmconfig.FileSettings.Directory,
-		FilesS3Config:            filesS3Config,
-		MaxFileSize:              *mmconfig.FileSettings.MaxFileSize,
-		Telemetry:                enableTelemetry,
-		TelemetryID:              serverID,
-		WebhookUpdate:            []string{},
-		SessionExpireTime:        2592000,
-		SessionRefreshTime:       18000,
-		LocalOnly:                false,
-		EnableLocalMode:          false,
-		LocalModeSocketLocation:  "",
-		AuthMode:                 "mattermost",
-		EnablePublicSharedBoards: enablePublicSharedBoards,
-		FeatureFlags:             featureFlags,
-		NotifyFreqCardSeconds:    getPluginSettingInt(mmconfig, notifyFreqCardSecondsKey, 120),
-		NotifyFreqBoardSeconds:   getPluginSettingInt(mmconfig, notifyFreqBoardSecondsKey, 86400),
-		EnableDataRetention:      enableBoardsDeletion,
-		DataRetentionDays:        *mmconfig.DataRetentionSettings.BoardsRetentionDays,
-		TeammateNameDisplay:      *mmconfig.TeamSettings.TeammateNameDisplay,
-		ShowEmailAddress:         showEmailAddress,
-		ShowFullName:             showFullName,
+		ServerRoot:              baseURL + "/boards",
+		Port:                    -1,
+		DBType:                  *mmconfig.SqlSettings.DriverName,
+		DBConfigString:          *mmconfig.SqlSettings.DataSource,
+		DBTablePrefix:           "focalboard_",
+		UseSSL:                  false,
+		SecureCookie:            true,
+		WebPath:                 path.Join(*mmconfig.PluginSettings.Directory, "focalboard", "pack"),
+		FilesDriver:             *mmconfig.FileSettings.DriverName,
+		FilesPath:               *mmconfig.FileSettings.Directory,
+		FilesS3Config:           filesS3Config,
+		MaxFileSize:             *mmconfig.FileSettings.MaxFileSize,
+		Telemetry:               enableTelemetry,
+		TelemetryID:             serverID,
+		WebhookUpdate:           []string{},
+		SessionExpireTime:       2592000,
+		SessionRefreshTime:      18000,
+		LocalOnly:               false,
+		EnableLocalMode:         false,
+		LocalModeSocketLocation: "",
+		AuthMode:                "mattermost",
+		FeatureFlags:            featureFlags,
+		NotifyFreqCardSeconds:   getPluginSettingInt(mmconfig, notifyFreqCardSecondsKey, 120),
+		NotifyFreqBoardSeconds:  getPluginSettingInt(mmconfig, notifyFreqBoardSecondsKey, 86400),
+		EnableDataRetention:     enableBoardsDeletion,
+		DataRetentionDays:       *mmconfig.DataRetentionSettings.BoardsRetentionDays,
+		TeammateNameDisplay:     *mmconfig.TeamSettings.TeammateNameDisplay,
+		ShowEmailAddress:        showEmailAddress,
+		ShowFullName:            showFullName,
 	}
 }

--- a/server/boards/server/configuration.go
+++ b/server/boards/server/configuration.go
@@ -85,9 +85,6 @@ func (b *BoardsService) OnConfigurationChange() error {
 	if mmconfig.PluginSettings.Plugins[PluginName][SharedBoardsName] == true {
 		enableShareBoards = true
 	}
-	if mmconfig.ProductSettings.EnablePublicSharedBoards != nil {
-		enableShareBoards = *mmconfig.ProductSettings.EnablePublicSharedBoards
-	}
 	configuration := &configuration{
 		EnablePublicSharedBoards: enableShareBoards,
 	}
--- a/server/platform/services/telemetry/telemetry.go
+++ b/server/platform/services/telemetry/telemetry.go
@@ -882,10 +882,6 @@ func (ts *TelemetryService) trackConfig() {
 		"retention_days": *cfg.ExportSettings.RetentionDays,
 	})

-	ts.SendTelemetry(TrackConfigProducts, map[string]any{
-		"enable_public_shared_boards": *cfg.ProductSettings.EnablePublicSharedBoards,
-	})
-
 	// Convert feature flags to map[string]any for sending
 	flags := cfg.FeatureFlags.ToMap()
 	interfaceFlags := make(map[string]any)
--- a/server/public/model/config.go
+++ b/server/public/model/config.go
@@ -2864,18 +2864,10 @@ func (s *CloudSettings) SetDefaults() {
 }

 type ProductSettings struct {
-	EnablePublicSharedBoards *bool
-	EnablePlaybooks          *bool
+	EnablePlaybooks *bool
 }

-func (s *ProductSettings) SetDefaults(plugins map[string]map[string]any) {
-	if s.EnablePublicSharedBoards == nil {
-		if p, ok := plugins[PluginIdFocalboard]; ok {
-			s.EnablePublicSharedBoards = NewBool(p["enablepublicsharedboards"].(bool))
-		} else {
-			s.EnablePublicSharedBoards = NewBool(false)
-		}
-	}
+func (s *ProductSettings) SetDefaults() {
 	if s.EnablePlaybooks == nil {
 		s.EnablePlaybooks = NewBool(true)
 	}
@@ -3360,7 +3352,7 @@ func (o *Config) SetDefaults() {
 	o.ThemeSettings.SetDefaults()
 	o.ClusterSettings.SetDefaults()
 	o.PluginSettings.SetDefaults(o.LogSettings)
-	o.ProductSettings.SetDefaults(o.PluginSettings.Plugins)
+	o.ProductSettings.SetDefaults()
 	o.AnalyticsSettings.SetDefaults()
 	o.ComplianceSettings.SetDefaults()
 	o.LocalizationSettings.SetDefaults()