From 94b2eca2d1b6d9c75cc2ed702ccfa38b58a9cf86 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 25 May 2018 04:41:30 +0800 Subject: add ExperimentalHideTownSquareinLHS in config setting (#8751) --- app/diagnostics.go | 53 +++++++++++++++++++++++++++-------------------------- config/default.json | 1 + model/config.go | 5 +++++ utils/config.go | 2 ++ 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/app/diagnostics.go b/app/diagnostics.go index 527ca9840..2c1fe64ab 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -244,32 +244,33 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ - "enable_user_creation": *cfg.TeamSettings.EnableUserCreation, - "enable_team_creation": *cfg.TeamSettings.EnableTeamCreation, - "restrict_team_invite": *cfg.TeamSettings.RestrictTeamInvite, - "restrict_public_channel_creation": *cfg.TeamSettings.RestrictPublicChannelCreation, - "restrict_private_channel_creation": *cfg.TeamSettings.RestrictPrivateChannelCreation, - "restrict_public_channel_management": *cfg.TeamSettings.RestrictPublicChannelManagement, - "restrict_private_channel_management": *cfg.TeamSettings.RestrictPrivateChannelManagement, - "restrict_public_channel_deletion": *cfg.TeamSettings.RestrictPublicChannelDeletion, - "restrict_private_channel_deletion": *cfg.TeamSettings.RestrictPrivateChannelDeletion, - "enable_open_server": *cfg.TeamSettings.EnableOpenServer, - "enable_custom_brand": *cfg.TeamSettings.EnableCustomBrand, - "restrict_direct_message": *cfg.TeamSettings.RestrictDirectMessage, - "max_notifications_per_channel": *cfg.TeamSettings.MaxNotificationsPerChannel, - "enable_confirm_notifications_to_channel": *cfg.TeamSettings.EnableConfirmNotificationsToChannel, - "max_users_per_team": *cfg.TeamSettings.MaxUsersPerTeam, - "max_channels_per_team": *cfg.TeamSettings.MaxChannelsPerTeam, - "teammate_name_display": *cfg.TeamSettings.TeammateNameDisplay, - "isdefault_site_name": isDefault(cfg.TeamSettings.SiteName, "Mattermost"), - "isdefault_custom_brand_text": isDefault(*cfg.TeamSettings.CustomBrandText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT), - "isdefault_custom_description_text": isDefault(*cfg.TeamSettings.CustomDescriptionText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT), - "isdefault_user_status_away_timeout": isDefault(*cfg.TeamSettings.UserStatusAwayTimeout, model.TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT), - "restrict_private_channel_manage_members": *cfg.TeamSettings.RestrictPrivateChannelManageMembers, - "enable_X_to_leave_channels_from_LHS": *cfg.TeamSettings.EnableXToLeaveChannelsFromLHS, - "experimental_enable_automatic_replies": *cfg.TeamSettings.ExperimentalEnableAutomaticReplies, - "experimental_town_square_is_read_only": *cfg.TeamSettings.ExperimentalTownSquareIsReadOnly, - "experimental_primary_team": isDefault(*cfg.TeamSettings.ExperimentalPrimaryTeam, ""), + "enable_user_creation": cfg.TeamSettings.EnableUserCreation, + "enable_team_creation": *cfg.TeamSettings.EnableTeamCreation, + "restrict_team_invite": *cfg.TeamSettings.RestrictTeamInvite, + "restrict_public_channel_creation": *cfg.TeamSettings.RestrictPublicChannelCreation, + "restrict_private_channel_creation": *cfg.TeamSettings.RestrictPrivateChannelCreation, + "restrict_public_channel_management": *cfg.TeamSettings.RestrictPublicChannelManagement, + "restrict_private_channel_management": *cfg.TeamSettings.RestrictPrivateChannelManagement, + "restrict_public_channel_deletion": *cfg.TeamSettings.RestrictPublicChannelDeletion, + "restrict_private_channel_deletion": *cfg.TeamSettings.RestrictPrivateChannelDeletion, + "enable_open_server": *cfg.TeamSettings.EnableOpenServer, + "enable_custom_brand": *cfg.TeamSettings.EnableCustomBrand, + "restrict_direct_message": *cfg.TeamSettings.RestrictDirectMessage, + "max_notifications_per_channel": *cfg.TeamSettings.MaxNotificationsPerChannel, + "enable_confirm_notifications_to_channel": *cfg.TeamSettings.EnableConfirmNotificationsToChannel, + "max_users_per_team": *cfg.TeamSettings.MaxUsersPerTeam, + "max_channels_per_team": *cfg.TeamSettings.MaxChannelsPerTeam, + "teammate_name_display": *cfg.TeamSettings.TeammateNameDisplay, + "isdefault_site_name": isDefault(cfg.TeamSettings.SiteName, "Mattermost"), + "isdefault_custom_brand_text": isDefault(*cfg.TeamSettings.CustomBrandText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT), + "isdefault_custom_description_text": isDefault(*cfg.TeamSettings.CustomDescriptionText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT), + "isdefault_user_status_away_timeout": isDefault(*cfg.TeamSettings.UserStatusAwayTimeout, model.TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT), + "restrict_private_channel_manage_members": *cfg.TeamSettings.RestrictPrivateChannelManageMembers, + "enable_X_to_leave_channels_from_LHS": *cfg.TeamSettings.EnableXToLeaveChannelsFromLHS, + "experimental_enable_automatic_replies": *cfg.TeamSettings.ExperimentalEnableAutomaticReplies, + "experimental_town_square_is_hidden_in_lhs": *cfg.TeamSettings.ExperimentalHideTownSquareinLHS, + "experimental_town_square_is_read_only": *cfg.TeamSettings.ExperimentalTownSquareIsReadOnly, + "experimental_primary_team": isDefault(*cfg.TeamSettings.ExperimentalPrimaryTeam, ""), }) a.SendDiagnostic(TRACK_CONFIG_CLIENT_REQ, map[string]interface{}{ diff --git a/config/default.json b/config/default.json index 1c4608c03..2d6265dcc 100644 --- a/config/default.json +++ b/config/default.json @@ -91,6 +91,7 @@ "EnableConfirmNotificationsToChannel": true, "TeammateNameDisplay": "username", "ExperimentalEnableAutomaticReplies": false, + "ExperimentalHideTownSquareinLHS": false, "ExperimentalTownSquareIsReadOnly": false, "ExperimentalPrimaryTeam": "" }, diff --git a/model/config.go b/model/config.go index 7c11860d2..deaae6db8 100644 --- a/model/config.go +++ b/model/config.go @@ -1022,6 +1022,7 @@ type TeamSettings struct { EnableConfirmNotificationsToChannel *bool TeammateNameDisplay *string ExperimentalEnableAutomaticReplies *bool + ExperimentalHideTownSquareinLHS *bool ExperimentalTownSquareIsReadOnly *bool ExperimentalPrimaryTeam *string } @@ -1120,6 +1121,10 @@ func (s *TeamSettings) SetDefaults() { s.ExperimentalEnableAutomaticReplies = NewBool(false) } + if s.ExperimentalHideTownSquareinLHS == nil { + s.ExperimentalHideTownSquareinLHS = NewBool(false) + } + if s.ExperimentalTownSquareIsReadOnly == nil { s.ExperimentalTownSquareIsReadOnly = NewBool(false) } diff --git a/utils/config.go b/utils/config.go index 18e25c999..c51ace554 100644 --- a/utils/config.go +++ b/utils/config.go @@ -554,6 +554,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["HasImageProxy"] = strconv.FormatBool(hasImageProxy) // Set default values for all options that require a license. + props["ExperimentalHideTownSquareinLHS"] = "false" props["ExperimentalTownSquareIsReadOnly"] = "false" props["ExperimentalEnableAuthenticationTransfer"] = "true" props["EnableCustomBrand"] = "false" @@ -609,6 +610,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) if license != nil { + props["ExperimentalHideTownSquareinLHS"] = strconv.FormatBool(*c.TeamSettings.ExperimentalHideTownSquareinLHS) props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly) props["ExperimentalEnableAuthenticationTransfer"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableAuthenticationTransfer) -- cgit v1.2.3-1-g7c22