Skip to content

[pull] master from mattermost:master#810

Merged
pull[bot] merged 2 commits into
code:masterfrom
mattermost:master
Jul 1, 2026
Merged

[pull] master from mattermost:master#810
pull[bot] merged 2 commits into
code:masterfrom
mattermost:master

Conversation

@pull

@pull pull Bot commented Jul 1, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

cursor Bot and others added 2 commits July 1, 2026 15:17
…l permission rule (#37234)

* Fix Upload Files pre-selected when creating a new channel permission rule

The new-rule editor seeded the draft with the Upload Files action
selected. New rules should start with no permissions selected.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Add tests for channel permission rule editor default permissions

Covers the regression guard that a new rule starts with no permissions
selected, and that existing rules preserve their selected permissions.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Strengthen permission rule editor tests per review

Scope the dropdown assertion to option descriptions so it can't pass
against a pre-selected table row, and add a validation test covering the
now-reachable empty-permissions save path.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
* Fix permission policy rule editor defaulting to advanced mode

The permission policy rule editor used a stale, divergent local copy of
isSimpleExpression that did not recognize parenthesized multiselect
"has any of" OR-groups or ranked-operator conditions as simple. Such
rules were misclassified as complex, so editing them opened the advanced
(CEL) editor instead of the simple table editor.

Use the shared isSimpleExpression helper (already used by the membership
policy editor) so the same set of simple expressions is recognized
consistently.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Add regression tests for permission policy editor default mode

Cover MM-69527: editing an existing permission policy rule must default
to Simple (table) mode for every expression the simple editor can
represent, including multiselect "has any of" OR-groups and ranked
operators. Complex expressions still open in Advanced (CEL) mode.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* ci: re-trigger CodeRabbit review

Co-authored-by: mattermost-code <matty-code@mattermost.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
@pull pull Bot locked and limited conversation to collaborators Jul 1, 2026
@pull pull Bot added the ⤵️ pull label Jul 1, 2026
@pull pull Bot merged commit be8f7fe into code:master Jul 1, 2026
4 of 5 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants