Merge remote-tracking branch 'upstream/master' into MM-47560

model/client4.go

@@ -8004,8 +8004,8 @@ func (c *Client4) ConfirmCustomerPayment(confirmRequest *ConfirmPaymentMethodReq
 	return BuildResponse(r), nil
 }
 
-func (c *Client4) RequestCloudTrial(email *StartCloudTrialRequest) (*Subscription, *Response, error) {
-	payload, err := json.Marshal(email)
+func (c *Client4) RequestCloudTrial(cloudTrialRequest *StartCloudTrialRequest) (*Subscription, *Response, error) {
+	payload, err := json.Marshal(cloudTrialRequest)
 	if err != nil {
 		return nil, nil, NewAppError("RequestCloudTrial", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}

model/cloud.go

@@ -110,11 +110,12 @@ type ValidateBusinessEmailResponse struct {
 
 // CloudCustomerInfo represents editable info of a customer.
 type CloudCustomerInfo struct {
-	Name             string `json:"name"`
-	Email            string `json:"email,omitempty"`
-	ContactFirstName string `json:"contact_first_name,omitempty"`
-	ContactLastName  string `json:"contact_last_name,omitempty"`
-	NumEmployees     int    `json:"num_employees"`
+	Name                                  string `json:"name"`
+	Email                                 string `json:"email,omitempty"`
+	ContactFirstName                      string `json:"contact_first_name,omitempty"`
+	ContactLastName                       string `json:"contact_last_name,omitempty"`
+	NumEmployees                          int    `json:"num_employees"`
+	MonthlySubscriptionIntentWireTransfer string `json:"monthly_subscription_intent_wire_transfer"`
 }
 
 // Address model represents a customer's address.

model/config.go

@@ -2747,6 +2747,16 @@ func (s *CloudSettings) SetDefaults() {
 	}
 }
 
+type ProductSettings struct {
+	EnablePublicSharedBoards *bool
+}
+
+func (s *ProductSettings) SetDefaults() {
+	if s.EnablePublicSharedBoards == nil {
+		s.EnablePublicSharedBoards = NewBool(false)
+	}
+}
+
 type PluginState struct {
 	Enable bool
 }
@@ -3136,6 +3146,7 @@ type Config struct {
 	DataRetentionSettings     DataRetentionSettings
 	MessageExportSettings     MessageExportSettings
 	JobSettings               JobSettings
+	ProductSettings           ProductSettings
 	PluginSettings            PluginSettings
 	DisplaySettings           DisplaySettings
 	GuestAccountsSettings     GuestAccountsSettings
@@ -3235,6 +3246,7 @@ func (o *Config) SetDefaults() {
 	o.ThemeSettings.SetDefaults()
 	o.ClusterSettings.SetDefaults()
 	o.PluginSettings.SetDefaults(o.LogSettings)
+	o.ProductSettings.SetDefaults()
 	o.AnalyticsSettings.SetDefaults()
 	o.ComplianceSettings.SetDefaults()
 	o.LocalizationSettings.SetDefaults()

model/feature_flags.go

@@ -76,6 +76,8 @@ type FeatureFlags struct {
 	SendWelcomePost bool
 
 	PostPriority bool
+
+	PeopleProduct bool
 }
 
 func (f *FeatureFlags) SetDefaults() {
@@ -104,6 +106,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.PlanUpgradeButtonText = "upgrade"
 	f.SendWelcomePost = true
 	f.PostPriority = false
+	f.PeopleProduct = false
 }
 
 func (f *FeatureFlags) Plugins() map[string]string {

model/insights.go

@@ -4,6 +4,7 @@
 package model
 
 import (
+	"net/http"
 	"time"
 )
 
@@ -260,6 +261,23 @@ func StartOfDayForTimeRange(timeRange string, location *time.Location) *time.Tim
 	return &resultTime
 }
 
+// GetStartOfDayForTimeRange gets the unix start time in milliseconds from the given time range.
+// Time range can be one of: "today", "7_day", or "28_day".
+func GetStartOfDayForTimeRange(timeRange string, location *time.Location) (*time.Time, *AppError) {
+	now := time.Now().In(location)
+	resultTime := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, location)
+	switch timeRange {
+	case TimeRangeToday:
+	case TimeRange7Day:
+		resultTime = resultTime.Add(time.Hour * time.Duration(-144))
+	case TimeRange28Day:
+		resultTime = resultTime.Add(time.Hour * time.Duration(-648))
+	default:
+		return nil, NewAppError("GetStartOfDayForTimeRange", "model.insights.get_start_of_day_for_time_range.time_range.app_error", nil, "", http.StatusBadRequest)
+	}
+	return &resultTime, nil
+}
+
 // GetTopReactionListWithPagination adds a rank to each item in the given list of TopReaction and checks if there is
 // another page that can be fetched based on the given limit and offset. The given list of TopReaction is assumed to be
 // sorted by Count. Returns a TopReactionList.

model/migration.go

@@ -38,4 +38,5 @@ const (
 	MigrationKeyAddPlaybooksPermissions                = "playbooks_permissions"
 	MigrationKeyAddCustomUserGroupsPermissions         = "custom_groups_permissions"
 	MigrationKeyAddPlayboosksManageRolesPermissions    = "playbooks_manage_roles"
+	MigrationKeyAddProductsBoardsPermissions           = "products_boards"
 )

model/permission.go

@@ -354,6 +354,9 @@ var PermissionRunManageProperties *Permission
 var PermissionRunManageMembers *Permission
 var PermissionRunView *Permission
 
+var PermissionSysconsoleReadProductsBoards *Permission
+var PermissionSysconsoleWriteProductsBoards *Permission
+
 // General permission that encompasses all system admin functions
 // in the future this could be broken up to allow access to some
 // admin functions but not others
@@ -2070,6 +2073,19 @@ func initializePermissions() {
 		PermissionScopeRun,
 	}
 
+	PermissionSysconsoleReadProductsBoards = &Permission{
+		"sysconsole_read_products_boards",
+		"",
+		"",
+		PermissionScopeSystem,
+	}
+	PermissionSysconsoleWriteProductsBoards = &Permission{
+		"sysconsole_write_products_boards",
+		"",
+		"",
+		PermissionScopeSystem,
+	}
+
 	SysconsoleReadPermissions = []*Permission{
 		PermissionSysconsoleReadAboutEditionAndLicense,
 		PermissionSysconsoleReadBilling,
@@ -2125,6 +2141,7 @@ func initializePermissions() {
 		PermissionSysconsoleReadExperimentalFeatures,
 		PermissionSysconsoleReadExperimentalFeatureFlags,
 		PermissionSysconsoleReadExperimentalBleve,
+		PermissionSysconsoleReadProductsBoards,
 	}
 
 	SysconsoleWritePermissions = []*Permission{
@@ -2182,6 +2199,7 @@ func initializePermissions() {
 		PermissionSysconsoleWriteExperimentalFeatures,
 		PermissionSysconsoleWriteExperimentalFeatureFlags,
 		PermissionSysconsoleWriteExperimentalBleve,
+		PermissionSysconsoleWriteProductsBoards,
 	}
 
 	SystemScopedPermissionsMinusSysconsole := []*Permission{

model/role.go

@@ -261,6 +261,7 @@ func init() {
 		PermissionSysconsoleReadExperimentalFeatures.Id,
 		PermissionSysconsoleReadExperimentalFeatureFlags.Id,
 		PermissionSysconsoleReadExperimentalBleve.Id,
+		PermissionSysconsoleReadProductsBoards.Id,
 	}
 
 	SystemManagerDefaultPermissions = []string{
@@ -339,6 +340,8 @@ func init() {
 		PermissionSysconsoleWriteIntegrationsBotAccounts.Id,
 		PermissionSysconsoleWriteIntegrationsGif.Id,
 		PermissionSysconsoleWriteIntegrationsCors.Id,
+		PermissionSysconsoleReadProductsBoards.Id,
+		PermissionSysconsoleWriteProductsBoards.Id,
 	}
 
 	SystemCustomGroupAdminDefaultPermissions = []string{