mattermost: remove unsupported edition message from menu
This commit is contained in:
parent
a572fe236c
commit
e226551eca
@ -127,11 +127,24 @@ index 8cd1d8a624..55554fb0ad 100644
|
|||||||
<Link
|
<Link
|
||||||
className='header-logo-link'
|
className='header-logo-link'
|
||||||
diff --git webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
diff --git webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
||||||
index 35646539c4..c1d1713948 100644
|
index 35646539c4..fbdbb39710 100644
|
||||||
--- webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
--- webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
||||||
+++ webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
+++ webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
||||||
@@ -14,22 +14,6 @@ import {LicenseLinks} from 'utils/constants';
|
@@ -1,42 +1,17 @@
|
||||||
|
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||||
|
// See LICENSE.txt for license information.
|
||||||
|
|
||||||
|
-import React from 'react';
|
||||||
|
-import {useIntl} from 'react-intl';
|
||||||
|
import {useSelector} from 'react-redux';
|
||||||
|
-import styled from 'styled-components';
|
||||||
|
|
||||||
|
import {getLicense} from 'mattermost-redux/selectors/entities/general';
|
||||||
|
|
||||||
|
-import ExternalLink from 'components/external_link';
|
||||||
|
-
|
||||||
|
-import {LicenseLinks} from 'utils/constants';
|
||||||
|
-
|
||||||
import './menu_item.scss';
|
import './menu_item.scss';
|
||||||
|
|
||||||
-const FreeVersionBadge = styled.div`
|
-const FreeVersionBadge = styled.div`
|
||||||
@ -153,11 +166,45 @@ index 35646539c4..c1d1713948 100644
|
|||||||
type Props = {
|
type Props = {
|
||||||
id: string;
|
id: string;
|
||||||
}
|
}
|
||||||
@@ -50,7 +34,6 @@ const MenuStartTrial = (props: Props): JSX.Element | null => {
|
|
||||||
role='menuitem'
|
const MenuStartTrial = (props: Props): JSX.Element | null => {
|
||||||
id={props.id}
|
- const {formatMessage} = useIntl();
|
||||||
>
|
-
|
||||||
|
const license = useSelector(getLicense);
|
||||||
|
const isCurrentLicensed = license?.IsLicensed;
|
||||||
|
|
||||||
|
@@ -44,33 +19,7 @@ const MenuStartTrial = (props: Props): JSX.Element | null => {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return (
|
||||||
|
- <li
|
||||||
|
- className={'MenuStartTrial'}
|
||||||
|
- role='menuitem'
|
||||||
|
- id={props.id}
|
||||||
|
- >
|
||||||
- <FreeVersionBadge>{'FREE EDITION'}</FreeVersionBadge>
|
- <FreeVersionBadge>{'FREE EDITION'}</FreeVersionBadge>
|
||||||
<div className='editionText'>
|
- <div className='editionText'>
|
||||||
{formatMessage(
|
- {formatMessage(
|
||||||
{
|
- {
|
||||||
|
- id: 'navbar_dropdown.versionText',
|
||||||
|
- defaultMessage: 'This is the free <link>unsupported</link> edition of Mattermost.',
|
||||||
|
- },
|
||||||
|
- {
|
||||||
|
- link: (msg: React.ReactNode) => (
|
||||||
|
- <ExternalLink
|
||||||
|
- location='menu_start_trial.unsupported-link'
|
||||||
|
- href={LicenseLinks.UNSUPPORTED}
|
||||||
|
- >
|
||||||
|
- {msg}
|
||||||
|
- </ExternalLink>
|
||||||
|
- ),
|
||||||
|
- },
|
||||||
|
- )}
|
||||||
|
- </div>
|
||||||
|
- </li>
|
||||||
|
- );
|
||||||
|
+ return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MenuStartTrial;
|
||||||
|
Loading…
Reference in New Issue
Block a user