Merge branch 'main' into private-templates

server/model/board.go

@@ -223,7 +223,8 @@ func (p *BoardPatch) Patch(board *Board) *Board {
 	}
 
 	if len(p.UpdatedCardProperties) != 0 || len(p.DeletedCardProperties) != 0 {
-		// first we accumulate all properties indexed by ID
+		// first we accumulate all properties indexed by, and maintain their order
+		keyOrder := []string{}
 		cardPropertyMap := map[string]map[string]interface{}{}
 		for _, prop := range board.CardProperties {
 			id, ok := prop["id"].(string)
@@ -233,6 +234,7 @@ func (p *BoardPatch) Patch(board *Board) *Board {
 			}
 
 			cardPropertyMap[id] = prop
+			keyOrder = append(keyOrder, id)
 		}
 
 		// if there are properties marked for removal, we delete them
@@ -249,13 +251,20 @@ func (p *BoardPatch) Patch(board *Board) *Board {
 				continue
 			}
 
+			_, exists := cardPropertyMap[id]
+			if !exists {
+				keyOrder = append(keyOrder, id)
+			}
 			cardPropertyMap[id] = newprop
 		}
 
 		// and finally we flatten and save the updated properties
 		newCardProperties := []map[string]interface{}{}
-		for _, p := range cardPropertyMap {
+		for _, key := range keyOrder {
-			newCardProperties = append(newCardProperties, p)
+			p, exists := cardPropertyMap[key]
+			if exists {
+				newCardProperties = append(newCardProperties, p)
+			}
 		}
 
 		board.CardProperties = newCardProperties

server/services/store/sqlstore/migrations/000017_add_teams_and_boards.up.sql

@@ -366,11 +366,11 @@ CREATE INDEX idx_boardmembers_user_id ON {{.prefix}}board_members(user_id);
 INSERT INTO {{.prefix}}board_members (
     SELECT B.Id, CM.UserId, CM.Roles, (CM.UserId=B.created_by) OR CM.SchemeAdmin, CM.SchemeUser, FALSE, CM.SchemeGuest
     FROM {{.prefix}}boards AS B
-    INNER JOIN ChannelMembers as CM ON CM.ChannelId=B.channel_id
+    INNER JOIN ChannelMembers as CM ON CM.ChannelId=B.channel_id;
 );
 {{else}}
 {{- /* if we're in personal server or desktop, create memberships for everyone */ -}}
 INSERT INTO {{.prefix}}board_members
      SELECT B.id, U.id, '', B.created_by=U.id, TRUE, FALSE, FALSE
-       FROM {{.prefix}}boards AS B, {{.prefix}}users AS U
+       FROM {{.prefix}}boards AS B, {{.prefix}}users AS U;
 {{end}}

server/services/store/sqlstore/util.go

@@ -3,6 +3,7 @@ package sqlstore
 import (
 	"database/sql"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"strings"
 
@@ -33,7 +34,12 @@ func PrepareNewTestDatabase() (dbType string, connectionString string, err error
 	var rootUser string
 
 	if dbType == model.SqliteDBType {
-		connectionString = "file::memory:?cache=shared&_busy_timeout=5000"
+		file, err := ioutil.TempFile("", "fbtest_*.db")
+		if err != nil {
+			return "", "", err
+		}
+		connectionString = file.Name() + "?_busy_timeout=5000"
+		_ = file.Close()
 	} else if port := strings.TrimSpace(os.Getenv("FB_STORE_TEST_DOCKER_PORT")); port != "" {
 		// docker unit tests take priority over any DSN env vars
 		var template string

webapp/cypress/support/api_commands.ts

@@ -117,8 +117,8 @@ Cypress.Commands.add('apiChangePassword', (userId: string, oldPassword: string,
 
 Cypress.Commands.add('uiCreateNewBoard', (title?: string) => {
     cy.log('**Create new empty board**')
-    cy.findByText('+ Add board').click()
+    cy.uiCreateEmptyBoard()
-    cy.get('.empty-board').first().click({force: true})
+
     cy.findByPlaceholderText('Untitled board').should('exist')
     cy.wait(10)
     if (title) {

webapp/cypress/support/ui_commands.ts

@@ -16,7 +16,6 @@ Cypress.Commands.add('uiCreateBoard', (item: string) => {
 Cypress.Commands.add('uiCreateEmptyBoard', () => {
     cy.log('Create new empty board')
 
-    cy.contains('+ Add board').should('be.visible').click()
+    cy.contains('+ Add board').should('be.visible').click().wait(500)
-
     return cy.contains('Create empty board').click({force: true}).wait(1000)
 })

webapp/src/components/shareBoard/shareBoard.tsx

@@ -273,17 +273,15 @@ export default function ShareBoardDialog(props: Props): JSX.Element {
             <div className='user-items'>
                 <TeamPermissionsRow/>
 
-                {Object.values(members).map((member) => {
+                {boardUsers.map((user) => {
-                    const user = boardUsers.find((u) => u.id === member.userId)
+                    if (!members[user.id]) {
-                    if (!user) {
                         return null
                     }
-
                     return (
                         <UserPermissionsRow
                             key={user.id}
                             user={user}
-                            member={member}
+                            member={members[user.id]}
                             onDeleteBoardMember={onDeleteBoardMember}
                             onUpdateBoardMember={onUpdateBoardMember}
                             isMe={user.id === me?.id}