MM-28733 : Admin Advisor v2 #6461

catalintomai · 2020-09-16T15:37:32Z

Summary

Admin Advisor v2.

Ticket Link

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

Related Pull Requests

server: https://github.com/mattermost/mattermost-server/pull/15515/files

hahmadia

Some small suggestions made. Let me know if you have any questions.

components/announcement_bar/configuration_bar/configuration_bar.jsx

components/warn_metric_ack_modal/warn_metric_ack_modal.tsx

hahmadia · 2020-09-17T15:01:20Z

@jasonblais Tag you for review as requested

i18n/en.json

mkraft · 2020-09-18T13:44:10Z

components/announcement_bar/configuration_bar/configuration_bar.jsx

+ />
+ <FormattedMessage
+ id={'announcement_bar.warn_metric_status_ack.text'}
+ defaultMessage={'Thank you for contacting Mattermost. We will follow up with you soon.'}


We're not going to mention that they're going to need to install a different instance? What's up with that?

I'll defer to @esadur and @jasonblais on this, they review the texts.

@mkraft, I'm not sure I understand the concern, can you elaborate a bit?

We are linking to documentation in almost all cases so that they can explore the feature and determine if it would be valuable to them. I would rather lead with the value of the features in question so they can make that determination for themselves.

mkraft · 2020-09-18T13:52:23Z

components/announcement_bar/configuration_bar/configuration_bar.jsx

+ />
+ <FormattedMarkdownMessage
+ id={t('announcement_bar.error.number_active_users_warn_metric_status.text')}
+ defaultMessage={'You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'}


Users are more likely to take action if you tell them exactly what you want them to do and why. This is so vague we're making them interpret it for themselves and it's not clear what we're asking of them.

mkraft · 2020-09-18T13:52:38Z

components/announcement_bar/configuration_bar/configuration_bar.jsx

+ />
+ <FormattedMarkdownMessage
+ id={t('announcement_bar.number_of_posts_warn_metric_status.text')}
+ defaultMessage={'You now have over {limit} posts. We strongly recommend using advanced features for large-scale servers.'}


components/warn_metric_ack_modal/warn_metric_ack_modal.tsx

hahmadia

Nice improvements. Just some syntax stuff and the typescript optional operator (I believe we should use it due to our move to typescript and it makes sense I feel).

hahmadia · 2020-09-18T15:54:03Z

components/warn_metric_ack_modal/warn_metric_ack_modal.tsx

 render() {
+ const isE0Edition = (this.props.enterpriseReady && this.props.license && this.props.license.IsLicensed === 'false');


I don't see why we can't take advantage of optional chaining regardless of the pattern? I noticed we are using license?. in other parts of code too? I'm not sure what pattern you are actually referring too.

I thought we were moving towards using optional chaining with the move towards typescript anyways.

hahmadia · 2020-09-18T15:54:35Z

components/announcement_bar/configuration_bar/configuration_bar.jsx

@@ -176,9 +211,13 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
 />
 );
 }
- if (this.props.license.IsLicensed === 'false' && this.props.warnMetricsStatus) {
+ if (this.props.license &&
+ this.props.license.IsLicensed === 'false' &&


See above comment

components/announcement_bar/configuration_bar/configuration_bar.jsx

components/warn_metric_ack_modal/warn_metric_ack_modal.tsx

hahmadia

LGTM! Thanks for the fixes. I still feel we should use the optional chaining for typescript however if you feel it's better not, then we can leave it. Maybe @mkraft can give his opinion if he has any otherwise no more changes I can see that need to be made.

Edit Maybe just update redux hash to get your build passing

srkgupta

Tested the updated PR along with it's dependent PRs and all the issues are now fixed and are working fine. Approving the PR.

amyblais · 2020-09-24T13:46:09Z

@mkraft Kind note to review for v5.28.

mattermod · 2020-09-25T22:00:54Z

Cherry pick is scheduled.

(cherry picked from commit 3b866f3)

…o MM-20457 * 'master' of github.com:Tak-Iwamoto/mattermost-webapp: [MM-28680] fix blank page on undefined message (mattermost#6450) MM-28733 : Admin Advisor v2 (mattermost#6461) MM 20547 user settings security ts (mattermost#6216) MM-20904 Add E2E tests for custom categories (mattermost#5981) Update NOTICE.txt (mattermost#6550) Check if emojiMap is undefined before invoking method for it (mattermost#6495) [MM-28151] Cypress/E2E: Automate backlogs - System Console > User Password (mattermost#6538) [MM-28295] e2e/messaging/reactions: add reactions spec (mattermost#6535) [MM-28706] revert ordering change for `in:` auto-suggest search results (mattermost#6493) Remove usage of t function with useIntl (mattermost#6552) MM-28992 Remove unused notPresent and mustBePresent props from MultiSelectSetting (mattermost#6544) MM-27530 Fix for Multiselect items not scrolling into view on arrow keys (mattermost#6286) Demoting failed test from prod (mattermost#6534) migrate show_more to typescript (mattermost#6501) [MM-28878] Revert style change to remove next steps arrow (mattermost#6527) [MM-28972] Added 'Always On' option for new sidebar (mattermost#6530) MM-28839 Fix for hover of cursor on indicators (mattermost#6524) [MM-28790] allow plugins to open in a different tab (mattermost#6476) MM-28290 Always update team member unread counts when added to a channel (mattermost#6500)

…o MM-20462 * 'master' of github.com:Tak-Iwamoto/mattermost-webapp: fix getType is not a function (mattermost#6566) MM-29028 Remove findDOMNode from Slack import (mattermost#6554) MM-28997 Remove references to old context API (mattermost#6545) Add custom slash command tests (mattermost#6391) Cypress/E2E: Fix guest experience ui spec (mattermost#6563) [MM-28784] Migrate string refs to functional ones (mattermost#6494) [MM-28680] fix blank page on undefined message (mattermost#6450) MM-28733 : Admin Advisor v2 (mattermost#6461) MM 20547 user settings security ts (mattermost#6216) MM-20904 Add E2E tests for custom categories (mattermost#5981) Update NOTICE.txt (mattermost#6550) Check if emojiMap is undefined before invoking method for it (mattermost#6495) [MM-28151] Cypress/E2E: Automate backlogs - System Console > User Password (mattermost#6538) [MM-28295] e2e/messaging/reactions: add reactions spec (mattermost#6535) [MM-28706] revert ordering change for `in:` auto-suggest search results (mattermost#6493) Remove usage of t function with useIntl (mattermost#6552) MM-28992 Remove unused notPresent and mustBePresent props from MultiSelectSetting (mattermost#6544) MM-27530 Fix for Multiselect items not scrolling into view on arrow keys (mattermost#6286) Demoting failed test from prod (mattermost#6534)

catalintomai added 2 commits September 12, 2020 13:32

temp work

d608ef5

Merge branch 'master' into OCTO-6

cef507b

This was referenced Sep 16, 2020

MM-28733 : Admin Advisor v2 mattermost/mattermost-redux#1237

Closed

MM-28733 : Admin Advisor v2 mattermost/mattermost#15515

Merged

cleanup + make check-style fixes

1fa0814

catalintomai added this to the v5.28 milestone Sep 16, 2020

catalintomai added 2 commits September 16, 2020 19:11

add support for 500k banner warning

1f34c72

remove ContextUs texts from the StartTrial version of the modal

5a97f51

catalintomai requested review from hahmadia and mkraft September 17, 2020 05:14

catalintomai added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Sep 17, 2020

catalintomai requested a review from srkgupta September 17, 2020 05:15

catalintomai mentioned this pull request Sep 17, 2020

MM-28733: Add AdminAdvisor v2 new API method reference mattermost/mattermost-api-reference#574

Merged

fix localization file

2e04eb4

hahmadia reviewed Sep 17, 2020

View reviewed changes

jasonblais reviewed Sep 17, 2020

View reviewed changes

i18n/en.json Outdated Show resolved Hide resolved

catalintomai added 3 commits September 17, 2020 14:40

address CR comments

0ccfee7

address CR comments

d9cce21

address CR comments

951a887

catalintomai requested a review from hahmadia September 17, 2020 22:25

mkraft suggested changes Sep 18, 2020

View reviewed changes

hahmadia reviewed Sep 18, 2020

View reviewed changes

catalintomai added 2 commits September 18, 2020 12:18

addressed CR comments

35b3e35

addressed CR comments

ecbbc9f

catalintomai requested a review from hahmadia September 18, 2020 19:44

hahmadia approved these changes Sep 18, 2020

View reviewed changes

catalintomai added 2 commits September 19, 2020 10:05

Merge branch 'master' into OCTO-6

a984fab

removed StartTrial from webapp following PR spec update

a5b096f

catalintomai added 7 commits September 20, 2020 13:02

updated mailto strings

fb5878c

addressed CR comments

8c33ee5

Merge branch 'master' into OCTO-6

154758f

updated ack banner text

e5f1a91

fix Jest test

305c792

address PM spec updates

3dfbab3

make sure we don't display banner if warn metric is invalid

e89862f

srkgupta approved these changes Sep 24, 2020

View reviewed changes

srkgupta removed the 3: QA Review Requires review by a QA tester label Sep 24, 2020

amyblais requested a review from mkraft September 24, 2020 12:24

mkraft approved these changes Sep 24, 2020

View reviewed changes

amyblais added CherryPick/Approved Meant for the quality or patch release tracked in the milestone and removed 2: Dev Review Requires review by a core commiter labels Sep 24, 2020

amyblais assigned catalintomai Sep 24, 2020

catalintomai added 2 commits September 24, 2020 08:51

Merge branch 'master' into OCTO-6

85ca2b6

Merge branch 'master' into OCTO-6

a2512d9

catalintomai merged commit 3b866f3 into mattermost:master Sep 25, 2020

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Sep 25, 2020

MM-28733 : Admin Advisor v2 (mattermost#6461)

f02de1a

(cherry picked from commit 3b866f3)

mattermost-build mentioned this pull request Sep 25, 2020

Automated cherry pick of #6461 #6564

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 Sep 25, 2020

amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Sep 25, 2020

catalintomai pushed a commit that referenced this pull request Sep 25, 2020

MM-28733 : Admin Advisor v2 (#6461) (#6564)

d83886f

(cherry picked from commit 3b866f3)

jfrerich pushed a commit that referenced this pull request Oct 23, 2020

MM-28733 : Admin Advisor v2 (#6461)

83f6cdd

calebroseland pushed a commit that referenced this pull request Oct 27, 2020

MM-28733 : Admin Advisor v2 (#6461)

8e03fcc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MM-28733 : Admin Advisor v2 #6461

MM-28733 : Admin Advisor v2 #6461

catalintomai commented Sep 16, 2020 •

edited

Loading

hahmadia left a comment

hahmadia commented Sep 17, 2020

mkraft Sep 18, 2020

catalintomai Sep 18, 2020

esadur Sep 21, 2020

esadur Sep 23, 2020

mkraft Sep 18, 2020

mkraft Sep 18, 2020

hahmadia left a comment

hahmadia Sep 18, 2020

hahmadia Sep 18, 2020

hahmadia left a comment •

edited

Loading

srkgupta left a comment

amyblais commented Sep 24, 2020

mattermod commented Sep 25, 2020

		render() {
		const isE0Edition = (this.props.enterpriseReady && this.props.license && this.props.license.IsLicensed === 'false');

MM-28733 : Admin Advisor v2 #6461

MM-28733 : Admin Advisor v2 #6461

Conversation

catalintomai commented Sep 16, 2020 • edited Loading

Summary

Ticket Link

Related Pull Requests

hahmadia left a comment

Choose a reason for hiding this comment

hahmadia commented Sep 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hahmadia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hahmadia left a comment • edited Loading

Choose a reason for hiding this comment

srkgupta left a comment

Choose a reason for hiding this comment

amyblais commented Sep 24, 2020

mattermod commented Sep 25, 2020

catalintomai commented Sep 16, 2020 •

edited

Loading

hahmadia left a comment •

edited

Loading