Migrate DM and private group message boards to a team

.vscode/launch.json

@@ -9,6 +9,7 @@
             "type": "go",
             "request": "launch",
             "mode": "debug",
+            "buildFlags": "-tags 'json1'",
             "program": "${workspaceFolder}/server/main",
             "cwd": "${workspaceFolder}"
         },

Makefile

@@ -12,6 +12,8 @@ ifeq ($(BUILD_NUMBER),)
 	BUILD_DATE := n/a
 endif
 
+BUILD_TAGS += json1
+
 LDFLAGS += -X "github.com/mattermost/focalboard/server/model.BuildNumber=$(BUILD_NUMBER)"
 LDFLAGS += -X "github.com/mattermost/focalboard/server/model.BuildDate=$(BUILD_DATE)"
 LDFLAGS += -X "github.com/mattermost/focalboard/server/model.BuildHash=$(BUILD_HASH)"
@@ -35,25 +37,25 @@ ci: server-test
 
 server: ## Build server for local environment.
 	$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=dev")
-	cd server; go build -ldflags '$(LDFLAGS)' -o ../bin/focalboard-server ./main
+	cd server; go build -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -o ../bin/focalboard-server ./main
 
 server-mac: ## Build server for Mac.
 	mkdir -p bin/mac
 	$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=mac")
-	cd server; env GOOS=darwin GOARCH=$(MAC_GO_ARCH) go build -ldflags '$(LDFLAGS)' -o ../bin/mac/focalboard-server ./main
+	cd server; env GOOS=darwin GOARCH=$(MAC_GO_ARCH) go build -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -o ../bin/mac/focalboard-server ./main
 
 server-linux: ## Build server for Linux.
 	mkdir -p bin/linux
 	$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=linux")
-	cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/linux/focalboard-server ./main
+	cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -o ../bin/linux/focalboard-server ./main
 
 server-win: ## Build server for Windows.
 	$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win")
-	cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/win/focalboard-server.exe ./main
+	cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -o ../bin/win/focalboard-server.exe ./main
 
 server-dll: ## Build server as Windows DLL.
 	$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win")
-	cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -buildmode=c-shared -o ../bin/win-dll/focalboard-server.dll ./main
+	cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -buildmode=c-shared -o ../bin/win-dll/focalboard-server.dll ./main
 
 server-linux-package: server-linux webapp
 	rm -rf package
@@ -83,7 +85,6 @@ server-linux-package-docker:
 
 generate: ## Install and run code generators.
 	cd server; go get -modfile=go.tools.mod github.com/golang/mock/mockgen
-	cd server; go get -modfile=go.tools.mod github.com/jteeuwen/go-bindata
 	cd server; go generate ./...
 
 server-lint: ## Run linters on server code.
@@ -101,27 +102,28 @@ modd-precheck:
 	fi; \
 
 watch: modd-precheck ## Run both server and webapp watching for changes
-	modd
+	env FOCALBOARD_BUILD_TAGS='$(BUILD_TAGS)' modd
 
 watch-single-user: modd-precheck ## Run both server and webapp in single user mode watching for changes
-	env FOCALBOARDSERVER_ARGS=--single-user modd
+	env FOCALBOARDSERVER_ARGS=--single-user FOCALBOARD_BUILD_TAGS='$(BUILD_TAGS)' modd
 
 watch-server-test: modd-precheck ## Run server tests watching for changes
-	modd -f modd-servertest.conf
+	env FOCALBOARD_BUILD_TAGS='$(BUILD_TAGS)' modd -f modd-servertest.conf
 
 server-test: server-test-sqlite server-test-mysql server-test-postgres ## Run server tests
 
 server-test-sqlite: ## Run server tests using sqlite
-	cd server; go test -race -v -count=1 ./...
+	cd server; go test -tags '$(BUILD_TAGS)' -race -v -count=1 -timeout=30m ./...
 
 server-test-mysql: export FB_UNIT_TESTING=1
 server-test-mysql: export FB_STORE_TEST_DB_TYPE=mysql
 server-test-mysql: export FB_STORE_TEST_DOCKER_PORT=44445
 
 server-test-mysql: ## Run server tests using mysql
 	@echo Starting docker container for mysql
+	docker-compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans
 	docker-compose -f ./docker-testing/docker-compose-mysql.yml run start_dependencies
-	cd server; go test -race -v -count=1 ./...
+	cd server; go test -tags '$(BUILD_TAGS)' -race -v -count=1 -timeout=30m ./...
 	docker-compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans
 
 server-test-postgres: export FB_UNIT_TESTING=1
@@ -130,8 +132,9 @@ server-test-postgres: export FB_STORE_TEST_DOCKER_PORT=44446
 
 server-test-postgres: ## Run server tests using postgres
 	@echo Starting docker container for postgres
+	docker-compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans
 	docker-compose -f ./docker-testing/docker-compose-postgres.yml run start_dependencies
-	cd server; go test -race -v -count=1 ./...
+	cd server; go test -tags '$(BUILD_TAGS)' -race -v -count=1 -timeout=30m ./...
 	docker-compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans
 
 webapp: ## Build webapp.
@@ -141,7 +144,7 @@ webapp-test: ## jest tests for webapp
 	cd webapp; npm run test
 
 watch-plugin: modd-precheck ## Run and upload the plugin to a development server
-	modd -f modd-watchplugin.conf
+	env FOCALBOARD_BUILD_TAGS='$(BUILD_TAGS)' modd -f modd-watchplugin.conf
 
 live-watch-plugin: modd-precheck ## Run and update locally the plugin in the development server
 	cd mattermost-plugin; make live-watch

config.json

@@ -1,8 +1,8 @@
 {
 	"serverRoot": "http://localhost:8000",
-	"port": 8000,
-	"dbtype": "sqlite3",
-	"dbconfig": "./focalboard.db",
+    "port": 8000,
+    "dbtype": "sqlite3",
+    "dbconfig": "./focalboard.db",
 	"dbtableprefix": "",
 	"postgres_dbconfig": "dbname=focalboard sslmode=disable",
 	"test_dbconfig": "file::memory:?cache=shared",
@@ -21,5 +21,5 @@
 	"authMode": "native",
 	"logging_cfg_file": "",
 	"audit_cfg_file": "",
-	"enablepublicsharedboards": false
+	"enablePublicSharedBoards": false
 }

experiments/webext/src/utils/networking.ts

@@ -38,7 +38,7 @@ export async function logIn(host: string, username: string, password: string) {
 
 export async function getBoards(host: string, token: string) {
   const json = await request('GET', host, 'workspaces/0/blocks?type=board', null, token) as Board[]
-  return json.filter(board => !board.fields.isTemplate)
+  return json.filter(board => !board.isTemplate)
 }
 
 export async function findUrlPropertyId(host: string, token: string, boardId: string) {

import/asana/importAsana.ts

@@ -129,7 +129,7 @@ function convert(input: Asana): Block[] {
         type: 'select',
         options
     }
-    board.fields.cardProperties = [cardProperty]
+    board.cardProperties = [cardProperty]
     blocks.push(board)
 
     // Board view

import/jira/jiraImporter.ts

@@ -90,41 +90,41 @@ function convert(items: any[]) {
     board.title = 'Jira import'
 
     // Compile standard properties
-    board.fields.cardProperties = []
+    board.cardProperties = []
 
     const priorityProperty = buildCardPropertyFromValues('Priority', items.map(o => o.priority?._))
-    board.fields.cardProperties.push(priorityProperty)
+    board.cardProperties.push(priorityProperty)
 
     const statusProperty = buildCardPropertyFromValues('Status', items.map(o => o.status?._))
-    board.fields.cardProperties.push(statusProperty)
+    board.cardProperties.push(statusProperty)
 
     const resolutionProperty = buildCardPropertyFromValues('Resolution', items.map(o => o.resolution?._))
-    board.fields.cardProperties.push(resolutionProperty)
+    board.cardProperties.push(resolutionProperty)
 
     const typeProperty = buildCardPropertyFromValues('Type', items.map(o => o.type?._))
-    board.fields.cardProperties.push(typeProperty)
+    board.cardProperties.push(typeProperty)
 
     const assigneeProperty = buildCardPropertyFromValues('Assignee', items.map(o => o.assignee?._))
-    board.fields.cardProperties.push(assigneeProperty)
+    board.cardProperties.push(assigneeProperty)
 
     const reporterProperty = buildCardPropertyFromValues('Reporter', items.map(o => o.reporter?._))
-    board.fields.cardProperties.push(reporterProperty)
+    board.cardProperties.push(reporterProperty)
 
     const originalUrlProperty: IPropertyTemplate = {
         id: Utils.createGuid(),
         name: 'Original URL',
         type: 'url',
         options: []
     }
-    board.fields.cardProperties.push(originalUrlProperty)
+    board.cardProperties.push(originalUrlProperty)
 
     const createdDateProperty: IPropertyTemplate = {
         id: Utils.createGuid(),
         name: 'Created Date',
         type: 'date',
         options: []
     }
-    board.fields.cardProperties.push(createdDateProperty)
+    board.cardProperties.push(createdDateProperty)
 
     blocks.push(board)
 
@@ -240,4 +240,4 @@ function showHelp() {
     exit(1)
 }
 
-export { run }
+export { run }

import/notion/importNotion.ts

@@ -135,7 +135,7 @@ function convert(input: any[], title: string): Block[] {
             type: 'select',
             options: []
         }
-        board.fields.cardProperties.push(cardProperty)
+        board.cardProperties.push(cardProperty)
     })
 
     // Set all column types to select
@@ -177,7 +177,7 @@ function convert(input: any[], title: string): Block[] {
                 continue
             }
 
-            const cardProperty = board.fields.cardProperties.find((o) => o.name === key)!
+            const cardProperty = board.cardProperties.find((o) => o.name === key)!
             let option = cardProperty.options.find((o) => o.value === value)
             if (!option) {
                 const color = optionColors[optionColorIndex % optionColors.length]

import/todoist/importTodoist.ts

@@ -82,7 +82,7 @@ function convert(input: Todoist, project: Project): Block[] {
     console.log(`Board: ${project.name}`)
     board.rootId = board.id
     board.title = project.name
-    board.fields.description = project.name
+    board.description = project.name
 
     // Convert lists (columns) to a Select property
     const optionIdMap = new Map<string, string>()
@@ -114,7 +114,7 @@ function convert(input: Todoist, project: Project): Block[] {
         type: 'select',
         options
     }
-    board.fields.cardProperties = [cardProperty]
+    board.cardProperties = [cardProperty]
     blocks.push(board)
 
     // Board view

import/trello/importTrello.ts

@@ -68,7 +68,7 @@ function convert(input: Trello): Block[] {
     console.log(`Board: ${input.name}`)
     board.rootId = board.id
     board.title = input.name
-    board.fields.description = input.desc
+    board.description = input.desc
 
     // Convert lists (columns) to a Select property
     const optionIdMap = new Map<string, string>()
@@ -92,7 +92,7 @@ function convert(input: Trello): Block[] {
         type: 'select',
         options
     }
-    board.fields.cardProperties = [cardProperty]
+    board.cardProperties = [cardProperty]
     blocks.push(board)
 
     // Board view

linux/main.go

@@ -13,6 +13,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/mattermost/focalboard/server/server"
 	"github.com/mattermost/focalboard/server/services/config"
+	"github.com/mattermost/focalboard/server/services/permissions/localpermissions"
 	"github.com/webview/webview"
 
 	"github.com/mattermost/mattermost-server/v6/shared/mlog"
@@ -66,6 +67,8 @@ func runServer(port int) (*server.Server, error) {
 		return nil, err
 	}
 
+	permissionsService := localpermissions.New(db, logger)
+
 	params := server.Params{
 		Cfg:             config,
 		SingleUserToken: sessionToken,
@@ -74,6 +77,7 @@ func runServer(port int) (*server.Server, error) {
 		ServerID:        "",
 		WSAdapter:       nil,
 		NotifyBackends:  nil,
+		PermissionsService: permissionsService,
 	}
 
 	server, err := server.New(params)