IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix about modal version for cloud installations (#25389)

Browse Source
This commit is contained in:
Antonis Stamatiou 2023-11-13 10:33:47 +02:00 committed by GitHub
parent 9cf84fb93f
commit bdb363bd28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
View File

@ -106,7 +106,7 @@ describe('components/AboutBuildModal', () => {
expect(screen.getByText('Mattermost Cloud')).toBeInTheDocument(); expect(screen.getByText('Mattermost Cloud')).toBeInTheDocument();
expect(screen.getByText('High trust messaging for the enterprise')).toBeInTheDocument(); expect(screen.getByText('High trust messaging for the enterprise')).toBeInTheDocument();
expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.0');
expect(screen.getByText('0123456789abcdef', {exact: false})).toBeInTheDocument(); expect(screen.getByText('0123456789abcdef', {exact: false})).toBeInTheDocument();
expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');

9
webapp/channels/src/components/about_build_modal/about_build_modal_cloud/about_build_modal_cloud.tsx
View File

@ -57,11 +57,6 @@ export default function AboutBuildModalCloud(props: Props) {
</div> </div>
); );
let mmversion = config.BuildNumber;
if (!isNaN(config.BuildNumber)) {
mmversion = 'ci';
}
return ( return (
<Modal <Modal
dialogClassName={classNames('a11y__modal', 'about-modal', 'cloud')} dialogClassName={classNames('a11y__modal', 'about-modal', 'cloud')}
@ -94,12 +89,12 @@ export default function AboutBuildModalCloud(props: Props) {
</h3> </h3>
<p className='subtitle'>{subTitle}</p> <p className='subtitle'>{subTitle}</p>
<div className='description'> <div className='description'>
<div> <div data-testid='aboutModalVersion'>
<FormattedMessage <FormattedMessage
id='about.version' id='about.version'
defaultMessage='Mattermost Version:' defaultMessage='Mattermost Version:'
/> />
<span id='versionString'>{'\u00a0' + mmversion}</span> <span id='versionString'>{'\u00a0' + config.Version}</span>
</div> </div>
</div> </div>
{licensee} {licensee}