Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Add new bot account settings page. #2954

Merged
merged 7 commits into from
Jun 16, 2019
Merged

Add new bot account settings page. #2954

merged 7 commits into from
Jun 16, 2019

Conversation

zkry
Copy link
Contributor

@zkry zkry commented Jun 12, 2019 •
edited
Loading

Summary

This PR adds a new settings page for bot accounts. The page has the settings for 'ServiceSettings.CreateBotAccounts' and 'ServiceSettings.DisableBotsWhenOwnerIsDeactivated'.

Ticket Link

https://mattermost.atlassian.net/browse/MM-15180
Github issue: mattermost/mattermost#11083

@hanzei hanzei requested a review from jasonblais June 12, 2019 18:26
@hanzei hanzei added 1: PM Review Requires review by a product manager Setup Old Test Server Triggers the creation of a test server labels Jun 12, 2019
jasonblais
jasonblais suggested changes Jun 12, 2019
View reviewed changes
Copy link
Contributor

@jasonblais jasonblais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @zkry! Great work, couple of small notes below

components/admin_console/admin_definition.jsx Outdated Show resolved Hide resolved
components/admin_console/admin_definition.jsx Outdated Show resolved Hide resolved
i18n/en.json Outdated Show resolved Hide resolved
i18n/en.json Outdated Show resolved Hide resolved
components/admin_console/admin_definition.jsx Outdated Show resolved Hide resolved
@hanzei hanzei added Setup Old Test Server Triggers the creation of a test server and removed Setup Old Test Server Triggers the creation of a test server labels Jun 13, 2019
@hanzei hanzei requested a review from jasonblais June 13, 2019 19:45
jasonblais
jasonblais approved these changes Jun 13, 2019
View reviewed changes
Copy link
Contributor

@jasonblais jasonblais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @zkry!

Tested UI:

  • Correct title, help text, options
  • Correct default option

Smoke tested functionality at the same time, though this PR wouldn't affect that

  • ServiceSettings.EnableUserAccessTokens enabled/disabled, bot account creation is correctly restricted
  • ServiceSettings.DisableBotsWhenOwnerIsDeactivated enabled --> user deactivation disables bots they manage; user demotion from SysAdmin to member does not affect bot state
  • ServiceSettings.DisableBotsWhenOwnerIsDeactivated disabled --> user deactivation enables bots they manage; user demotion from SysAdmin to member does not affect bot state

@jasonblais jasonblais added 2: Dev Review Requires review by a core commiter and removed 1: PM Review Requires review by a product manager Setup Old Test Server Triggers the creation of a test server labels Jun 13, 2019
@jasonblais jasonblais removed their assignment Jun 13, 2019
jespino
jespino approved these changes Jun 14, 2019
View reviewed changes
Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @zkry! 🎉

bradjcoughlin
bradjcoughlin approved these changes Jun 14, 2019
View reviewed changes
Copy link
Contributor

@bradjcoughlin bradjcoughlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor thing, but this could be ‘botAccounts’ instead of ‘botAccount’: ‘admin.integrations.botAccount.title’. Otherwise, looks good!

@zkry
Copy link
Contributor Author

zkry commented Jun 16, 2019

And thank you guys for making such a nice contributor experience!

@jespino
Copy link
Member

jespino commented Jun 16, 2019

Thank you @zkry!

@jespino jespino merged commit 288877f into mattermost:master Jun 16, 2019
@jespino jespino added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Jun 16, 2019
@jespino jespino mentioned this pull request Jun 16, 2019
Closed
@hanzei hanzei added this to the v5.14.0 milestone Jun 17, 2019
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Needed Requires documentation labels Jul 16, 2019
aaronrothschild added a commit to mattermost/docs that referenced this pull request Aug 16, 2019
@aaronrothschild
Added new 'Bot Accounts' page under 'Integrations'
bbe5db5 
-Moved EnableBotCreation from previous location
- Added new settings `DisableBotsWhenOwnerIsDeactivated`

mattermost/mattermost-webapp#2954
@aaronrothschild aaronrothschild mentioned this pull request Aug 16, 2019
Merged
@aaronrothschild
Copy link
Contributor

Updated documentation to reflect the new location of enabling bot accounts, and also added the new flag.

mattermost/docs#2925

@aaronrothschild aaronrothschild added Docs/Done Required documentation has been written and removed Docs/Needed Requires documentation labels Aug 16, 2019
amyblais pushed a commit to mattermost/docs that referenced this pull request Aug 16, 2019
@aaronrothschild @amyblais
Added new 'Bot Accounts' page under 'Integrations' (#2925)
d549d6b 
* Added new 'Bot Accounts' page under 'Integrations'

-Moved EnableBotCreation from previous location
- Added new settings `DisableBotsWhenOwnerIsDeactivated`

mattermost/mattermost-webapp#2954

* Update config-settings.rst

* Removed old `EnableBots` location
amyblais added a commit to mattermost/docs that referenced this pull request Aug 17, 2019
@amyblais
V5.14 documentation (#2929)
2165471 
* Update conf.py

* Update net-promoter-score.rst

* MM-16938: update plugins HA docs

Reflect the 5.14 changes to upload plugins to the file store, simplifying deployment in HA environments. Simplify the overall dialogue of the page, updating some legacy links and terminology.

* Update source/administration/plugins.rst

Co-Authored-By: Jason Blais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: Jason Blais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: Jason Blais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: Jason Blais <[email protected]>

* s/prepackaged/pre-packaged

* Update important-upgrade-notes.rst

* Update source/administration/plugins.rst

Co-Authored-By: amyblais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: Jason Blais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: amyblais <[email protected]>

* Update source/administration/plugins.rst

Co-Authored-By: amyblais <[email protected]>

* Update plugins.rst

s/plugin/plugins/

* Update important-upgrade-notes.rst

* Update config-settings.rst

* Update sso-office.md

* Update signing-in.rst

* Update open-source-components.rst

* Create accessibility.rst

* MM-11701 Log request ID for outgoing webhooks 

- Added a note specifying that there is a request_id appended to the webhook after 5.14

* Update command-line-tools.rst

* minor tweak

* Update sso-google.md

* Add files via upload

* Minor tweak

* Update attaching-files.rst

* Update account-settings.rst

* Update accessibility.rst

* Add files via upload

* Add files via upload

* Add files via upload

* Update accessibility.rst

* Update accessibility.rst

* Add files via upload

* Update accessibility.rst

* Update accessibility.rst

* Update user.rst

* Update keyboard-shortcuts.rst

* Update keyboard-shortcuts.rst

* Minor tweaks

* Update command-line-tools.rst

* Update branding.rst

* Update command-line-tools.rst

* Minor tweaks

* Update migrating.rst

* Minor tweak

* Update sso-saml-okta.rst

* Update sso-saml-adfs.rst

* Update sso-saml-onelogin.rst

* Update config-settings.rst

* Update statistics.rst

* Update telemetry.rst

* Remove upgrade note regarding plugin health check

The setting is not removed, the setting revert was removed via mattermost/mattermost#11819

@amyblais please help update changelog if appropriate?

* Document 5.14 telemetry

ClusterSettings: bool NetworkInterface, bool BindAddress, bool AdvertiseAddress
 - mattermost/mattermost#11677

PluginSettings: bool AllowInsecureDownloadUrl
 - mattermost/mattermost#11372

ElasticsearchSettings: bool SkipTLSVerification, bool Trace
 - mattermost/mattermost#11189
 - mattermost/mattermost#11008

SamlSettings: bool SignRequest
 - mattermost/mattermost#11081

* Added note about password fields subtypes

MM-14593-Add-password-type-for-Interactive-Dialogs

* Noted DAU/MAU excludes bots now

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update sso-google.md

* Update config-settings.rst

* Update permissions-backend.rst (#2912)

* Update permissions-backend.rst

* Update permissions-backend.rst

* Update ldap-group-constrained-team-channel.rst (#2913)

* Update ldap-group-constrained-team-channel.rst

* Update ldap-group-constrained-team-channel.rst

* Minor tweak

* Update ldap-group-constrained-team-channel.rst

* Update source/deployment/ldap-group-constrained-team-channel.rst

Co-Authored-By: Martin Kraft <[email protected]>

* Update source/deployment/ldap-group-constrained-team-channel.rst

Co-Authored-By: Martin Kraft <[email protected]>

* Update source/deployment/ldap-group-constrained-team-channel.rst

Co-Authored-By: Martin Kraft <[email protected]>

* Update config-settings.rst (#2901)

* Update config-settings.rst

* Update config-settings.rst

* Update source/administration/config-settings.rst

Co-Authored-By: amyblais <[email protected]>

* Update source/administration/config-settings.rst

Co-Authored-By: amyblais <[email protected]>

* Update source/administration/config-settings.rst

Co-Authored-By: amyblais <[email protected]>

* Update source/administration/config-settings.rst

Co-Authored-By: amyblais <[email protected]>

* Update config-settings.rst

* Update config-settings.rst

* Update ldap-group-constrained-team-channel.rst (#2918)

* MM-15128 change openDialog to allow dialogs with no elements

Noted the use case for having 0 elements in an interactive dialog box

* MM-16389 Reference icon_emoji parameter for webhooks

Added a tip about the parameter, and removed it from the Slack compatibility "limitations" list.

* Update mobile-faq.rst (#2922)

* Added bots account type to compliance exports

- Noted that as of 5.14, there is a new field called "UserType" that labels either 'bot' or 'user'.
- Removed planned implementation note

* Added note that relative URLs are now accepted

* Noted that Emoji in Titles are supported in v5.14

* Removed words

* Update interactive-messages.rst (#2923)

* Update config-settings.rst (#2919)

* Update config-settings.rst

* Update config-settings.rst

* Update config-settings.rst

* Updated header section for 'mattermost user' functions (#2927)

Noted that bots can be converted both ways

* Updated `mattermost user convert` for Bot --> User (#2926)

- Added new example format (had to use an OR because of how the command is structured)
- Added a new example command that would run properly
- Added the new `--user` option flag and details.
mattermost/mattermost#10803

* Added new 'Bot Accounts' page under 'Integrations' (#2925)

* Added new 'Bot Accounts' page under 'Integrations'

-Moved EnableBotCreation from previous location
- Added new settings `DisableBotsWhenOwnerIsDeactivated`

mattermost/mattermost-webapp#2954

* Update config-settings.rst

* Removed old `EnableBots` location

* v5.14 Changelog (#2850)

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Jesse Hallam <[email protected]>

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update source/administration/changelog.md

Co-Authored-By: Martin Kraft <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Martin Kraft <[email protected]>

* Update source/administration/changelog.md

Co-Authored-By: Martin Kraft <[email protected]>

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jespino jespino jespino approved these changes

@jasonblais jasonblais jasonblais approved these changes

@bradjcoughlin bradjcoughlin bradjcoughlin approved these changes

Assignees

@aaronrothschild aaronrothschild

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Done Required documentation has been written
Projects
None yet
Milestone
v5.14.0
7 participants
@zkry @jespino @aaronrothschild @jasonblais @bradjcoughlin @hanzei @amyblais