MM-29011: Add feature flag for shared channels (#15585)
* MM-29011: Add feature flag for shared channels https://mattermost.atlassian.net/browse/MM-29011 * gofmt Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
ab816b18ce
Коммит
0e90606547
@@ -59,6 +59,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
|
|||||||
} else {
|
} else {
|
||||||
props["ExperimentalChannelOrganization"] = strconv.FormatBool(false)
|
props["ExperimentalChannelOrganization"] = strconv.FormatBool(false)
|
||||||
}
|
}
|
||||||
|
props["ExperimentalSharedChannels"] = strconv.FormatBool(*c.ExperimentalSettings.EnableSharedChannels)
|
||||||
|
|
||||||
props["ExperimentalChannelSidebarOrganization"] = *c.ServiceSettings.ExperimentalChannelSidebarOrganization
|
props["ExperimentalChannelSidebarOrganization"] = *c.ServiceSettings.ExperimentalChannelSidebarOrganization
|
||||||
props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies)
|
props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies)
|
||||||
|
|||||||
@@ -875,6 +875,7 @@ type ExperimentalSettings struct {
|
|||||||
UseNewSAMLLibrary *bool `access:"experimental,cloud_restrictable"`
|
UseNewSAMLLibrary *bool `access:"experimental,cloud_restrictable"`
|
||||||
CloudUserLimit *int64 `access:"experimental,write_restrictable,cloud_restrictable"`
|
CloudUserLimit *int64 `access:"experimental,write_restrictable,cloud_restrictable"`
|
||||||
CloudBilling *bool `access:"experimental,write_restrictable,cloud_restrictable"`
|
CloudBilling *bool `access:"experimental,write_restrictable,cloud_restrictable"`
|
||||||
|
EnableSharedChannels *bool `access:"experimental"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ExperimentalSettings) SetDefaults() {
|
func (s *ExperimentalSettings) SetDefaults() {
|
||||||
@@ -910,6 +911,10 @@ func (s *ExperimentalSettings) SetDefaults() {
|
|||||||
if s.UseNewSAMLLibrary == nil {
|
if s.UseNewSAMLLibrary == nil {
|
||||||
s.UseNewSAMLLibrary = NewBool(false)
|
s.UseNewSAMLLibrary = NewBool(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s.EnableSharedChannels == nil {
|
||||||
|
s.EnableSharedChannels = NewBool(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type AnalyticsSettings struct {
|
type AnalyticsSettings struct {
|
||||||
|
|||||||
@@ -683,6 +683,7 @@ func (ts *TelemetryService) trackConfig() {
|
|||||||
"restrict_system_admin": *cfg.ExperimentalSettings.RestrictSystemAdmin,
|
"restrict_system_admin": *cfg.ExperimentalSettings.RestrictSystemAdmin,
|
||||||
"use_new_saml_library": *cfg.ExperimentalSettings.UseNewSAMLLibrary,
|
"use_new_saml_library": *cfg.ExperimentalSettings.UseNewSAMLLibrary,
|
||||||
"cloud_billing": *cfg.ExperimentalSettings.CloudBilling,
|
"cloud_billing": *cfg.ExperimentalSettings.CloudBilling,
|
||||||
|
"enable_shared_channels": *cfg.ExperimentalSettings.EnableSharedChannels,
|
||||||
})
|
})
|
||||||
|
|
||||||
ts.sendTelemetry(TRACK_CONFIG_ANALYTICS, map[string]interface{}{
|
ts.sendTelemetry(TRACK_CONFIG_ANALYTICS, map[string]interface{}{
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user