Skip to content

Commit f237557

Browse files
CopilotCopilot
authored
Merge upstream dependency updates and bug-fix PRs from mattermost-community/focalboard (#4)
* Initial plan * Merge upstream PR mattermost-community#5099: Bump the github-actions-updates group across 2 directories with 7 updates * Merge upstream PR mattermost-community#5042: fix file info delete query * Merge upstream PR mattermost-community#5041: [mattermost-communityGH-4843] Deletes newly created card after close if no interaction were made in * Merge upstream PR mattermost-community#4959: Fix BiDi Text Issues App Wide * Merge upstream PR mattermost-community#4957: MM-52722: Fixed error when accessing property on undefined * Merge upstream PR mattermost-community#4907: prevent ModifiedBy overwrite * Merge upstream PR mattermost-community#4868: fixed Bug: After deleting a board, using the undo feature would redirect... * Merge upstream PR mattermost-community#4619: Fixing role dropdown for admins * Merge upstream PR mattermost-community#4899: Replace a non-semantic JSX child in one of the test files with an empty fragment --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]>
1 parent 492e722 commit f237557

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+264
-267
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
30+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3131

3232
- name: Set up Go
33-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
33+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
3434
with:
3535
go-version-file: server/go.mod
3636

@@ -41,20 +41,20 @@ jobs:
4141
runs-on: ubuntu-22.04
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
44+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
4545
with:
4646
path: "focalboard"
4747

4848
- name: npm ci
4949
run: cd focalboard/webapp && npm ci && cd -
5050

5151
- name: Set up Go
52-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
52+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
5353
with:
5454
go-version-file: focalboard/server/go.mod
5555

5656
- name: Setup Node
57-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
57+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903
5858
with:
5959
node-version-file: focalboard/webapp/.nvmrc
6060

@@ -65,7 +65,7 @@ jobs:
6565
run: cp focalboard/bin/linux/focalboard-server focalboard/bin/
6666

6767
- name: Upload server package
68-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
68+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
6969
with:
7070
name: focalboard-server-linux-amd64.tar.gz
7171
path: ${{ github.workspace }}/focalboard/dist/focalboard-server-linux-amd64.tar.gz
@@ -83,12 +83,12 @@ jobs:
8383

8484
steps:
8585
- name: Checkout
86-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
86+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
8787
with:
8888
path: "focalboard"
8989

9090
- name: Set up Go
91-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
91+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
9292
with:
9393
go-version-file: focalboard/server/go.mod
9494

@@ -105,12 +105,12 @@ jobs:
105105

106106
steps:
107107
- name: Checkout
108-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
108+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
109109
with:
110110
path: "focalboard"
111111

112112
- name: Set up Go
113-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
113+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
114114
with:
115115
go-version-file: focalboard/server/go.mod
116116

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e
33+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb
3434
with:
3535
languages: ${{ matrix.language }}
3636
debug: false
3737
config-file: ./.github/codeql/codeql-config.yml
3838

3939
# Autobuild attempts to build any compiled languages
4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e
41+
uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb
4242

4343
# Perform Analysis
4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e
45+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb

‎.github/workflows/dev-release.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
ubuntu:
1717
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2020
with:
2121
path: "focalboard"
2222

@@ -30,12 +30,12 @@ jobs:
3030
run: cd focalboard/webapp; npm ci --no-optional
3131

3232
- name: Set up Go
33-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
33+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
3434
with:
3535
go-version: 1.21
3636

3737
- name: Setup Node
38-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
38+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903
3939
with:
4040
node-version: 20.11.0
4141

@@ -54,13 +54,13 @@ jobs:
5454
BUILD_NUMBER: ${{ github.run_id }}
5555

5656
- name: Upload server package
57-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
57+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
5858
with:
5959
name: focalboard-server-linux-amd64.tar.gz
6060
path: ${{ github.workspace }}/focalboard/dist/focalboard-server-linux-amd64.tar.gz
6161

6262
- name: Upload app package
63-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
63+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
6464
with:
6565
name: focalboard-linux.tar.gz
6666
path: ${{ github.workspace }}/focalboard/linux/dist/focalboard-linux.tar.gz
@@ -71,7 +71,7 @@ jobs:
7171
steps:
7272

7373
- name: Checkout
74-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
74+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
7575
with:
7676
path: "focalboard"
7777
- name: Replace token 1 server
@@ -84,7 +84,7 @@ jobs:
8484
run: cd focalboard/webapp; npm ci --no-optional
8585

8686
- name: Set up Go
87-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
87+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
8888
with:
8989
go-version: 1.21
9090

@@ -98,7 +98,7 @@ jobs:
9898
BUILD_NUMBER: ${{ github.run_id }}
9999

100100
- name: Upload macOS package
101-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
101+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
102102
with:
103103
name: focalboard-mac.zip
104104
path: ${{ github.workspace }}/focalboard/mac/dist/focalboard-mac.zip
@@ -108,20 +108,20 @@ jobs:
108108

109109
steps:
110110
- name: Checkout
111-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
111+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
112112
with:
113113
path: "focalboard"
114114
- name: Replace token 1 server
115115
run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go
116116

117117
- name: Add msbuild to PATH
118-
uses: microsoft/setup-msbuild@v1.3
118+
uses: microsoft/setup-msbuild@v2
119119

120120
- name: npm ci
121121
run: cd focalboard/webapp; npm ci --no-optional
122122

123123
- name: Set up Go
124-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
124+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
125125
with:
126126
go-version: 1.21
127127

@@ -139,13 +139,13 @@ jobs:
139139
BUILD_NUMBER: ${{ github.run_id }}
140140

141141
- name: Upload app msix package
142-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
142+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
143143
with:
144144
name: focalboard.msix
145145
path: ${{ github.workspace }}/focalboard/win-wpf/focalboard.msix
146146

147147
- name: Upload app zip package
148-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
148+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
149149
with:
150150
name: focalboard-win.zip
151151
path: ${{ github.workspace }}/focalboard/win-wpf/dist/focalboard-win.zip

‎.github/workflows/lint-server.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
down-migrations:
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
18+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1919
with:
2020
path: "focalboard"
2121
- name: assert that down migrations are SELECT 1 scripts
@@ -28,10 +28,10 @@ jobs:
2828
name: plugin
2929
runs-on: ubuntu-22.04
3030
steps:
31-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
31+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
3232
with:
3333
go-version: 1.21
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3535
with:
3636
path: "focalboard"
3737
- name: set up golangci-lint

‎.github/workflows/prod-release.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1717
with:
1818
path: "focalboard"
1919

@@ -27,12 +27,12 @@ jobs:
2727
run: cd focalboard/webapp; npm ci --no-optional
2828

2929
- name: Set up Go
30-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
30+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
3131
with:
3232
go-version: 1.21
3333

3434
- name: Setup Node
35-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
35+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903
3636
with:
3737
node-version: 20.11.0
3838

@@ -51,13 +51,13 @@ jobs:
5151
BUILD_NUMBER: ${{ github.run_id }}
5252

5353
- name: Upload server package
54-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
54+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
5555
with:
5656
name: focalboard-server-linux-amd64.tar.gz
5757
path: ${{ github.workspace }}/focalboard/dist/focalboard-server-linux-amd64.tar.gz
5858

5959
- name: Upload app package
60-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
60+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
6161
with:
6262
name: focalboard-linux.tar.gz
6363
path: ${{ github.workspace }}/focalboard/linux/dist/focalboard-linux.tar.gz
@@ -68,7 +68,7 @@ jobs:
6868
steps:
6969

7070
- name: Checkout
71-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
71+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
7272
with:
7373
path: "focalboard"
7474

@@ -82,7 +82,7 @@ jobs:
8282
run: cd focalboard/webapp; npm ci --no-optional
8383

8484
- name: Set up Go
85-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
85+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
8686
with:
8787
go-version: 1.21
8888

@@ -96,7 +96,7 @@ jobs:
9696
BUILD_NUMBER: ${{ github.run_id }}
9797

9898
- name: Upload macOS package
99-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
99+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
100100
with:
101101
name: focalboard-mac.zip
102102
path: ${{ github.workspace }}/focalboard/mac/dist/focalboard-mac.zip
@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
109+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
110110
with:
111111
path: "focalboard"
112112

@@ -117,13 +117,13 @@ jobs:
117117
run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go
118118

119119
- name: Add msbuild to PATH
120-
uses: microsoft/setup-msbuild@v1.3
120+
uses: microsoft/setup-msbuild@v2
121121

122122
- name: npm ci
123123
run: cd focalboard/webapp; npm ci --no-optional
124124

125125
- name: Set up Go
126-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
126+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
127127
with:
128128
go-version: 1.21
129129

@@ -141,13 +141,13 @@ jobs:
141141
BUILD_NUMBER: ${{ github.run_id }}
142142

143143
- name: Upload app msix package
144-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
144+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
145145
with:
146146
name: focalboard.msix
147147
path: ${{ github.workspace }}/focalboard/win-wpf/focalboard.msix
148148

149149
- name: Upload app zip package
150-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
150+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
151151
with:
152152
name: focalboard-win.zip
153153
path: ${{ github.workspace }}/focalboard/win-wpf/dist/focalboard-win.zip

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
steps:
2424
- name: "Checkout code"
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2626
with:
2727
persist-credentials: false
2828

2929
- name: "Run analysis"
30-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
30+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3131
with:
3232
results_file: results.sarif
3333
results_format: sarif
@@ -42,14 +42,14 @@ jobs:
4242

4343
# Upload the results as artifacts (optional).
4444
- name: "Upload artifact"
45-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
45+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
4646
with:
4747
name: SARIF file
4848
path: results.sarif
4949
retention-days: 5
5050

5151
# Upload the results to GitHub's code scanning dashboard.
5252
- name: "Upload to code-scanning"
53-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e
53+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb
5454
with:
5555
sarif_file: results.sarif

‎server/app/boards.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const linkBoardMessage = "@%s linked the board [%s](%s) with this channel"
2222
const unlinkBoardMessage = "@%s unlinked the board [%s](%s) with this channel"
2323

2424
var errNoDefaultCategoryFound = errors.New("no default category found for user")
25+
var errMemberRoleCannotBeChanged = errors.New("cannot change the role of this member")
2526

2627
func (a *App) GetBoard(boardID string) (*model.Board, error) {
2728
board, err := a.store.GetBoard(boardID)
@@ -564,6 +565,10 @@ func (a *App) UpdateBoardMember(member *model.BoardMember) (*model.BoardMember,
564565
return nil, bErr
565566
}
566567

568+
if a.permissions.HasPermissionToTeam(member.UserID, board.TeamID, model.PermissionManageTeam) {
569+
return nil, errMemberRoleCannotBeChanged
570+
}
571+
567572
oldMember, err := a.store.GetMemberForBoard(member.BoardID, member.UserID)
568573
if model.IsErrNotFound(err) {
569574
return nil, nil

0 commit comments

Comments
 (0)