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

MM-28733 : Admin Advisor v2 #6461

Merged
merged 25 commits into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d608ef5
temp work
catalintomai Sep 12, 2020
cef507b
Merge branch 'master' into OCTO-6
catalintomai Sep 16, 2020
1fa0814
cleanup + make check-style fixes
catalintomai Sep 16, 2020
1f34c72
add support for 500k banner warning
catalintomai Sep 17, 2020
5a97f51
remove ContextUs texts from the StartTrial version of the modal
catalintomai Sep 17, 2020
2e04eb4
fix localization file
catalintomai Sep 17, 2020
0ccfee7
address CR comments
catalintomai Sep 17, 2020
d9cce21
address CR comments
catalintomai Sep 17, 2020
951a887
address CR comments
catalintomai Sep 17, 2020
35b3e35
addressed CR comments
catalintomai Sep 18, 2020
ecbbc9f
addressed CR comments
catalintomai Sep 18, 2020
a984fab
Merge branch 'master' into OCTO-6
catalintomai Sep 19, 2020
a5b096f
removed StartTrial from webapp following PR spec update
catalintomai Sep 20, 2020
7d70359
refactor multiple warn metric banners handling
catalintomai Sep 20, 2020
da1c74d
remove enterpriseReady references
catalintomai Sep 20, 2020
c6972b7
clean up i18n file
catalintomai Sep 20, 2020
fb5878c
updated mailto strings
catalintomai Sep 20, 2020
8c33ee5
addressed CR comments
catalintomai Sep 22, 2020
154758f
Merge branch 'master' into OCTO-6
catalintomai Sep 22, 2020
e5f1a91
updated ack banner text
catalintomai Sep 23, 2020
305c792
fix Jest test
catalintomai Sep 23, 2020
3dfbab3
address PM spec updates
catalintomai Sep 24, 2020
e89862f
make sure we don't display banner if warn metric is invalid
catalintomai Sep 24, 2020
85ca2b6
Merge branch 'master' into OCTO-6
catalintomai Sep 24, 2020
a2512d9
Merge branch 'master' into OCTO-6
catalintomai Sep 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated ack banner text
  • Loading branch information
catalintomai committed Sep 23, 2020
commit e5f1a9158f1af380e8846fabcc91bd9a82e10760
41 changes: 15 additions & 26 deletions components/announcement_bar/configuration_bar/configuration_bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,38 +75,27 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
var canCloseBar = false;

if (warnMetricStatus.acked) {
if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
message = (
<React.Fragment>
<img
className='advisor-icon'
src={ackIcon}
/>
<FormattedMessage
id='announcement_bar.warn_metric_status_ack.text'
defaultMessage='Thank you for contacting Mattermost. We will follow up with you soon.'
/>
</React.Fragment>
);
message = (
<React.Fragment>
<img
className='advisor-icon'
src={ackIcon}
/>
<FormattedMessage
id='announcement_bar.warn_metric_status_ack.text'
defaultMessage='Thank you for contacting Mattermost. We will follow up with you soon.'
/>
</React.Fragment>
);

if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
dismissFunc = this.dismissNumberOfActiveUsersWarnMetricAck;
isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatusAck;
} else if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_500K) {
message = (
<React.Fragment>
<img
className='advisor-icon'
src={ackIcon}
/>
<FormattedMessage
id='announcement_bar.warn_metric_status_ack.text'
defaultMessage='Thank you for contacting Mattermost. We will follow up with you soon.'
/>
</React.Fragment>
);
dismissFunc = this.dismissNumberOfPostsWarnMetricAck;
isDismissed = this.props.dismissedNumberOfPostsWarnMetricStatusAck;
}

type = AnnouncementBarTypes.ADVISOR_ACK;
showModal = false;
canCloseBar = true;
Expand All @@ -119,7 +108,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
src={alertIcon}
/>
<FormattedMarkdownMessage
id='announcement_bar.error.number_active_users_warn_metric_status.text'
id='announcement_bar.number_active_users_warn_metric_status.text'
defaultMessage='You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'
values={{
limit: warnMetricStatus.limit,
Expand Down
4 changes: 2 additions & 2 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1982,15 +1982,15 @@
"announcement_bar.error.email_verification_required": "Check your email inbox to verify the address.",
"announcement_bar.error.license_expired": "Enterprise license is expired and some features may be disabled. [Please renew](!{link}).",
"announcement_bar.error.license_expiring": "Enterprise license expires on {date, date, long}. [Please renew](!{link}).",
"announcement_bar.error.number_active_users_warn_metric_status.text": "You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.",
"announcement_bar.error.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
"announcement_bar.error.preview_mode": "Preview Mode: Email notifications have not been configured.",
"announcement_bar.error.site_url_gitlab.full": "Please configure your [site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) either on the [System Console](/admin_console/environment/web_server) or, if you're using GitLab Mattermost, in gitlab.rb.",
"announcement_bar.error.site_url.full": "Please configure your [site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) on the [System Console](/admin_console/environment/web_server).",
"announcement_bar.error.warn_metric_status.link": "Learn more",
"announcement_bar.notification.email_verified": "Email verified",
"announcement_bar.number_active_users_warn_metric_status.text": "You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.",
"announcement_bar.number_of_posts_warn_metric_status.text": "You now have over {limit} posts. We strongly advise using advanced features to avoid degraded performance.",
"announcement_bar.warn_metric_status_ack.text": "You have over 500,000 posts. We strongly advise using advanced features to avoid degraded performance.",
"announcement_bar.warn_metric_status_ack.text": "Thank you for contacting Mattermost. We will follow up with you soon.",
"announcement_bar.warn_metric_status.number_of_posts_ack.text": "Thank you for contacting Mattermost. We will follow up with you soon.",
"announcement_bar.warn_metric_status.number_of_posts.text": "Announcement bar warn metric status.",
"announcement_bar.warn_metric_status.number_of_users_ack.text": "Thank you for contacting Mattermost. We will follow up with you soon.",
Expand Down