[MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels #24987

BenCookie95 · 2023-10-17T20:58:04Z

Summary

There was a bug where you could not @ mention custom groups in group constrained teams, this fixes that issue. I think the ldap and custom group codes needs a complete review, there is a lot going on.

Ticket Link

https://mattermost.atlassian.net/browse/MM-54933

Release Note

Fixed a bug where you couldn't @ mention custom groups in group constrained teams and channels

BenCookie95 · 2023-10-17T21:44:36Z

/update-branch

hanzei

Nice work on the tests 👍

server/channels/app/notification.go

mattermost-build · 2023-10-18T08:36:56Z

E2E tests not automatically triggered, because the PR is not in a mergeable state. Please update the branch with the base branch and resolve outstanding conflicts.

hanzei

LGTM 👍

JulienTant

LGTM, thanks @BenCookie95

BenCookie95 · 2023-10-31T19:40:12Z

/update-branch

DHaussermann · 2023-11-15T20:34:27Z

/update-branch

DHaussermann

Tested and passed

Custom groups are now shown even when LDPA sync is enforced for team membership as well as on channels when channel membership is enforced
When there are no group members present on the team for the custom group a system message gives UI feedback
When a member of the custom group is also in the LDPA group and Team sync is enforced, the mention works normally
Regression tested custom group CRUD operations and ensured mention options are removed when a group is archived
LDAP sync enforcement on/off works as expected to remove members when sync is run
Tested LDAP group sync for teams as well as channels
Enable Group Mentions for a specific LDAP groups (feature labeled as Beta in the UI) and it works as expected

LGTM!
Note: This issue was a bit specific to find. I'll open a PR shortly to add a Zephyr test case for this.

Thanks @BenCookie95 👍

mattermost-build · 2023-11-16T16:24:23Z

Cherry pick is scheduled.

…ained teams and channels (#24987) * add the ability to @ mention custom groups in group constrained teams --------- Co-authored-by: Mattermost Build <build@mattermost.com> (cherry picked from commit 2a896f8)

…ained teams and channels (#24987) (#25457) Automatic Merge

BenCookie95 · 2023-11-28T19:20:28Z

/cherry-pick release-8.1

mattermost-build · 2023-11-28T19:20:31Z

Cherry pick is scheduled.

mattermost-build · 2023-11-28T19:20:43Z

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/mattermost
   6ef43761f9..7a75e0d81b  CLD-6537              -> upstream/CLD-6537
   e95a331f38..3e797f3c59  bumpMySQL             -> upstream/bumpMySQL
   30381835ea..ac1250d568  feat/MM-55031-oauth-connection-app-backend -> upstream/feat/MM-55031-oauth-connection-app-backend
   2e537ce074..f686be76b6  feature-wrangler-mono -> upstream/feature-wrangler-mono
 * [new branch]            gm_conversion_modal_narrow_fix -> upstream/gm_conversion_modal_narrow_fix
   6a021a29f9..95670abcea  master                -> upstream/master
   e0132cfcc5..5fba7e1427  mm-55094-improve-roles-by-name-endpoint -> upstream/mm-55094-improve-roles-by-name-endpoint
 * [new branch]            mm-55484-add-bookmark-permissions -> upstream/mm-55484-add-bookmark-permissions
   d98e52cd93..7bf5dcb8fb  release-9.3           -> upstream/release-9.3
 * [new tag]               v9.3.0-rc2            -> v9.3.0-rc2
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-#24987-upstream-release-8.1-1701199238
Switched to a new branch 'automated-cherry-pick-of-mattermost-#24987-upstream-release-8.1-1701199238'
Branch 'automated-cherry-pick-of-mattermost-#24987-upstream-release-8.1-1701199238' set up to track remote branch 'release-8.1' from 'upstream'.

+++ About to attempt cherry pick of PR #24987 with merge commit 2a896f8420fbd7a71ba146688f4cc63ecba8bcdf.

Auto-merging server/channels/app/notification.go
Auto-merging server/channels/app/notification_test.go
CONFLICT (content): Merge conflict in server/channels/app/notification_test.go
Auto-merging webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.test.ts
Auto-merging webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts
CONFLICT (content): Merge conflict in webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts
error: could not apply 2a896f8420... [MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels (#24987)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU server/channels/app/notification_test.go
UU webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

add the ability to @ mention custom groups in group constrained teams

94ce4cd

mm-cloud-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 17, 2023

BenCookie95 requested review from JulienTant and hanzei October 17, 2023 20:58

lint

4dde455

Merge branch 'master' into MM-54933

ef6e9ab

hanzei reviewed Oct 18, 2023

View reviewed changes

server/channels/app/notification.go Outdated Show resolved Hide resolved

hanzei added 2: Dev Review Requires review by a developer 3: QA Review Requires review by a QA tester. May occur at the same time as Dev Review labels Oct 18, 2023

BenCookie95 requested a review from hanzei October 24, 2023 19:51

hanzei approved these changes Oct 26, 2023

View reviewed changes

JulienTant approved these changes Oct 27, 2023

View reviewed changes

BenCookie95 requested a review from DHaussermann October 27, 2023 19:15

BenCookie95 removed the 2: Dev Review Requires review by a developer label Oct 27, 2023

hanzei added this to the v9.3.0 milestone Oct 31, 2023

BenCookie95 added 3 commits October 31, 2023 15:18

fixing conflicts

e5ca93a

Merge remote-tracking branch 'upstream/MM-54933' into MM-54933

4e7e899

fixing test

454006f

mattermost-build and others added 3 commits October 31, 2023 20:40

Merge branch 'master' into MM-54933

c6f8117

fix tests

7f8d400

Merge remote-tracking branch 'upstream/MM-54933' into MM-54933

40dda18

amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Nov 13, 2023

Merge branch 'master' into MM-54933

6401833

DHaussermann approved these changes Nov 16, 2023

View reviewed changes

DHaussermann added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester. May occur at the same time as Dev Review labels Nov 16, 2023

BenCookie95 merged commit 2a896f8 into master Nov 16, 2023
43 checks passed

BenCookie95 deleted the MM-54933 branch November 16, 2023 16:24

mattermost-build mentioned this pull request Nov 16, 2023

Automated cherry pick of #24987 #25457

Merged

mattermost-build added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 16, 2023

mattermost-build added a commit that referenced this pull request Nov 16, 2023

[MM-54933] Add the ability to @ mention custom groups in group constr…

abc9e73

…ained teams and channels (#24987) (#25457) Automatic Merge

amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Nov 16, 2023

BenCookie95 mentioned this pull request Nov 28, 2023

fix conflicts and cherry pick groups fix #25564

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels #24987

[MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels #24987

BenCookie95 commented Oct 17, 2023

BenCookie95 commented Oct 17, 2023

hanzei left a comment

mattermost-build commented Oct 18, 2023

hanzei left a comment

JulienTant left a comment

BenCookie95 commented Oct 31, 2023

DHaussermann commented Nov 15, 2023

DHaussermann left a comment

mattermost-build commented Nov 16, 2023

BenCookie95 commented Nov 28, 2023

mattermost-build commented Nov 28, 2023

mattermost-build commented Nov 28, 2023 •

edited by jira bot

[MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels #24987

[MM-54933] Add the ability to @ mention custom groups in group constrained teams and channels #24987

Conversation

BenCookie95 commented Oct 17, 2023

Summary

Ticket Link

Release Note

BenCookie95 commented Oct 17, 2023

hanzei left a comment

Choose a reason for hiding this comment

mattermost-build commented Oct 18, 2023

hanzei left a comment

Choose a reason for hiding this comment

JulienTant left a comment

Choose a reason for hiding this comment

BenCookie95 commented Oct 31, 2023

DHaussermann commented Nov 15, 2023

DHaussermann left a comment

Choose a reason for hiding this comment

mattermost-build commented Nov 16, 2023

BenCookie95 commented Nov 28, 2023

mattermost-build commented Nov 28, 2023

mattermost-build commented Nov 28, 2023 • edited by jira bot

mattermost-build commented Nov 28, 2023 •

edited by jira bot