[MM-34838] Remove Ancillary Permissions That Are Purposefully Being Remove #7959

hahmadia · 2021-04-20T13:58:09Z

Summary
If I have a section permission that gives me ancillary permissions, I cannot remove an ancillary permission individually via MMCTL anymore. This PR aims to resolve this issue.

For example.
I have SYSCONSOLE_XXXX_WRITE which gives me manage_team permission, if I try to remove manage_team, it will always keep being re-added.

Ticket Link
https://mattermost.atlassian.net/browse/MM-34838

Server Changes: mattermost/mattermost#17466

NONE

hahmadia · 2021-04-20T15:14:31Z

/update-branch

mkraft

So nice to not have to open a separate PR for Redux! :)

packages/mattermost-redux/src/client/client4.ts

furqanmlk

.

mm-cloud-bot · 2021-04-20T21:33:46Z

Test server destroyed

furqanmlk

LGTM

mm-cloud-bot · 2021-04-21T15:34:53Z

@hahmadia: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

I understand the commands that are listed here

mattermod · 2021-04-21T15:36:05Z

Cherry pick is scheduled.

mattermod · 2021-04-21T15:36:08Z

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

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.114.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   ac725eb2e..559e554b0  MM-33462_manifest     -> upstream/MM-33462_manifest
 * [new branch]          MM-34169_data-retention-cypress -> upstream/MM-34169_data-retention-cypress
 * [new branch]          MM-34437              -> upstream/MM-34437
 * [new branch]          MM-34460              -> upstream/MM-34460
   97fb51499..aa99c800b  MM-34503-new-option-for-cloud-trial -> upstream/MM-34503-new-option-for-cloud-trial
   ba42ce9f4..4c18b633d  MM-34758              -> upstream/MM-34758
   025e8435f..ffde35333  MM-34910              -> upstream/MM-34910
   0eed30586..ed7c391df  MM-34977-fix-upgrade-trial-button -> upstream/MM-34977-fix-upgrade-trial-button
   ce3a686e8..ccacddc96  cloud                 -> upstream/cloud
 * [new branch]          compass-icon-font-update-pr-3 -> upstream/compass-icon-font-update-pr-3
   9446bbf01..e75e3cdc9  fix-Zephyr-keys-and-polish-3 -> upstream/fix-Zephyr-keys-and-polish-3
   5a9f4cc08..21991f233  master                -> upstream/master
 * [new branch]          mm34134_emoji-updates -> upstream/mm34134_emoji-updates
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
!!! 'upstream/release-5.35' not found. The second argument should be something like upstream/release-0.21.
    (In particular, it needs to be a valid, existing remote branch that I can 'git checkout'.)

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

hahmadia · 2021-04-21T15:47:01Z

/cherry-pick cloud

mattermod · 2021-04-21T15:47:03Z

Cherry pick is scheduled.

…emove (mattermost#7959) * Get Ancillary Permissions in FrontEnd * fix typo * fix linting * Update packages/mattermost-redux/src/client/client4.ts Co-authored-by: Mattermod <[email protected]> (cherry picked from commit 21991f2)

amyblais · 2021-04-22T17:19:25Z

/cherry-pick release-5.35

mattermod · 2021-04-22T17:19:27Z

Cherry pick is scheduled.

…emove (mattermost#7959) * Get Ancillary Permissions in FrontEnd * fix typo * fix linting * Update packages/mattermost-redux/src/client/client4.ts Co-authored-by: Mattermod <[email protected]> (cherry picked from commit 21991f2)

…emove (#7959) (#7973) Automatic Merge

…emove (#7959) * Get Ancillary Permissions in FrontEnd * fix typo * fix linting * Update packages/mattermost-redux/src/client/client4.ts Co-authored-by: Mattermod <[email protected]>

hahmadia added 3 commits April 20, 2021 09:51

Get Ancillary Permissions in FrontEnd

378dc75

fix typo

8968930

fix linting

db838ff

hahmadia requested a review from mkraft April 20, 2021 15:13

amyblais added this to the v5.35 milestone Apr 20, 2021

Merge branch 'master' into MM-34838-RemoveUnwantedAncillaryPermissions

392abb4

mkraft approved these changes Apr 20, 2021

View reviewed changes

hahmadia commented Apr 20, 2021

View reviewed changes

packages/mattermost-redux/src/client/client4.ts Outdated Show resolved Hide resolved

Update packages/mattermost-redux/src/client/client4.ts

10561d1

sbishel self-requested a review April 20, 2021 16:19

sbishel approved these changes Apr 20, 2021

View reviewed changes

sbishel added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Apr 20, 2021

sbishel requested a review from furqanmlk April 20, 2021 16:22

hahmadia removed the 2: Dev Review Requires review by a core commiter label Apr 20, 2021

amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Apr 20, 2021

furqanmlk added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Apr 20, 2021

furqanmlk reviewed Apr 20, 2021

View reviewed changes

furqanmlk removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Apr 20, 2021

furqanmlk approved these changes Apr 21, 2021

View reviewed changes

hahmadia added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Apr 21, 2021

mm-cloud-bot added do-not-merge/release-note-label-needed release-note-none and removed do-not-merge/release-note-label-needed labels Apr 21, 2021

hahmadia merged commit 21991f2 into mattermost:master Apr 21, 2021

hahmadia deleted the MM-34838-RemoveUnwantedAncillaryPermissions branch April 21, 2021 15:36

mattermost-build mentioned this pull request Apr 21, 2021

Automated cherry pick of #7959 #7966

Closed

mattermod 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 Apr 21, 2021

amyblais added CherryPick/Approved Meant for the quality or patch release tracked in the milestone and removed CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone labels Apr 21, 2021

mattermost-build mentioned this pull request Apr 22, 2021

Automated cherry pick of #7959 #7973

Merged

mattermod 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 Apr 22, 2021

mattermod pushed a commit that referenced this pull request Apr 22, 2021

[MM-34838] Remove Ancillary Permissions That Are Purposefully Being R…

b4d8d25

…emove (#7959) (#7973) Automatic Merge

amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Apr 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MM-34838] Remove Ancillary Permissions That Are Purposefully Being Remove #7959

[MM-34838] Remove Ancillary Permissions That Are Purposefully Being Remove #7959

hahmadia commented Apr 20, 2021 •

edited

Loading

hahmadia commented Apr 20, 2021

mkraft left a comment

furqanmlk left a comment •

edited

Loading

mm-cloud-bot commented Apr 20, 2021

furqanmlk left a comment

mm-cloud-bot commented Apr 21, 2021

mattermod commented Apr 21, 2021

mattermod commented Apr 21, 2021

hahmadia commented Apr 21, 2021

mattermod commented Apr 21, 2021

amyblais commented Apr 22, 2021

mattermod commented Apr 22, 2021

[MM-34838] Remove Ancillary Permissions That Are Purposefully Being Remove #7959

[MM-34838] Remove Ancillary Permissions That Are Purposefully Being Remove #7959

Conversation

hahmadia commented Apr 20, 2021 • edited Loading

hahmadia commented Apr 20, 2021

mkraft left a comment

Choose a reason for hiding this comment

furqanmlk left a comment • edited Loading

Choose a reason for hiding this comment

mm-cloud-bot commented Apr 20, 2021

furqanmlk left a comment

Choose a reason for hiding this comment

mm-cloud-bot commented Apr 21, 2021

mattermod commented Apr 21, 2021

mattermod commented Apr 21, 2021

hahmadia commented Apr 21, 2021

mattermod commented Apr 21, 2021

amyblais commented Apr 22, 2021

mattermod commented Apr 22, 2021

hahmadia commented Apr 20, 2021 •

edited

Loading

furqanmlk left a comment •

edited

Loading