From 517faccc332ce48de43e597d1b2d29a3961241e7 Mon Sep 17 00:00:00 2001
From: FurmanovD <39990503+FurmanovD@users.noreply.github.com>
Date: Mon, 17 Sep 2018 13:46:06 +0300
Subject: MM-11424 Extend bulk import to support themes across teams(#9305)
 (#9419)

* MM-11424 Extend bulk import to support themes across teams(#9305)

Also added:
Advanced Settings:
+'feature_enabled_markdown_preview'
+'formatting'
Sidebar Settings:
+'show_unread_section'

* MM-11424 (PR review) user teams' theme validator test updated

* MM-11424 (PR review) added test with valid JSON of invalid theme(by structure)

JSON string contains numeric and JSON object fields, not just a correct "string":"string" map
---
 app/import_types.go | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'app/import_types.go')

diff --git a/app/import_types.go b/app/import_types.go
index 7d53e5b16..168d43bab 100644
--- a/app/import_types.go
+++ b/app/import_types.go
@@ -40,18 +40,21 @@ type ChannelImportData struct {
 }
 
 type UserImportData struct {
-	ProfileImage *string `json:"profile_image"`
-	Username     *string `json:"username"`
-	Email        *string `json:"email"`
-	AuthService  *string `json:"auth_service"`
-	AuthData     *string `json:"auth_data"`
-	Password     *string `json:"password"`
-	Nickname     *string `json:"nickname"`
-	FirstName    *string `json:"first_name"`
-	LastName     *string `json:"last_name"`
-	Position     *string `json:"position"`
-	Roles        *string `json:"roles"`
-	Locale       *string `json:"locale"`
+	ProfileImage       *string `json:"profile_image"`
+	Username           *string `json:"username"`
+	Email              *string `json:"email"`
+	AuthService        *string `json:"auth_service"`
+	AuthData           *string `json:"auth_data"`
+	Password           *string `json:"password"`
+	Nickname           *string `json:"nickname"`
+	FirstName          *string `json:"first_name"`
+	LastName           *string `json:"last_name"`
+	Position           *string `json:"position"`
+	Roles              *string `json:"roles"`
+	Locale             *string `json:"locale"`
+	UseMarkdownPreview *string `json:"feature_enabled_markdown_preview"`
+	UseFormatting      *string `json:"formatting"`
+	ShowUnreadSection  *string `json:"show_unread_section"`
 
 	Teams *[]UserTeamImportData `json:"teams"`
 
@@ -82,6 +85,7 @@ type UserNotifyPropsImportData struct {
 type UserTeamImportData struct {
 	Name     *string                  `json:"name"`
 	Roles    *string                  `json:"roles"`
+	Theme    *string                  `json:"theme"`
 	Channels *[]UserChannelImportData `json:"channels"`
 }
 
-- 
cgit v1.2.3-1-g7c22