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

MM 20404 Migrate 'components/announcement_bar/version_bar' module and associated tests to TypeScript #6976

Merged
merged 7 commits into from
Nov 13, 2020
Merged

MM 20404 Migrate 'components/announcement_bar/version_bar' module and associated tests to TypeScript #6976

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
905efb4
MM-20404
tianlangwu Oct 30, 2020
b4071fe
MM-20404 Migrate 'components/announcement_bar/version_bar' module and…
tianlangwu Oct 30, 2020
6c3c2d1
fix lint
tianlangwu Oct 30, 2020
3b2e29c
MM-20404 Migrate 'components/announcement_bar/version_bar' module and…
tianlangwu Nov 2, 2020
04439c1
fix linter
tianlangwu Nov 2, 2020
95082bd
Merge branch 'master' into MM-20404
mattermod Nov 3, 2020
0331f94
Merge branch 'master' into MM-20404
mattermod Nov 12, 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
0 ...r/__snapshots__/version_bar.test.jsx.snap → ...r/__snapshots__/version_bar.test.tsx.snap
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions ...nts/announcement_bar/version_bar/index.js → ...nts/announcement_bar/version_bar/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

import {connect} from 'react-redux';

import VersionBar from './version_bar.jsx';
import {GlobalState} from 'mattermost-redux/types/store';

function mapStateToProps(state) {
import VersionBar from './version_bar';

function mapStateToProps(state:GlobalState) {
return {
serverVersion: state.entities.general.serverVersion,
};
Expand Down
2 changes: 1 addition & 1 deletion ...ment_bar/version_bar/version_bar.test.jsx → ...ment_bar/version_bar/version_bar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from 'react';
import {shallow} from 'enzyme';

import VersionBar from 'components/announcement_bar/version_bar/version_bar.jsx';
import VersionBar from 'components/announcement_bar/version_bar/version_bar';
import AnnouncementBar from 'components/announcement_bar/default_announcement_bar';

describe('components/VersionBar', () => {
Expand Down
17 changes: 10 additions & 7 deletions ...ouncement_bar/version_bar/version_bar.jsx → ...ouncement_bar/version_bar/version_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// See LICENSE.txt for license information.

import React from 'react';
import PropTypes from 'prop-types';

import {FormattedMessage} from 'react-intl';

Expand All @@ -11,20 +10,24 @@ import {AnnouncementBarTypes} from 'utils/constants';

import AnnouncementBar from '../default_announcement_bar';

export default class VersionBar extends React.PureComponent {
static propTypes = {
serverVersion: PropTypes.string,
};
interface Props {
serverVersion: string,
}

interface State {
serverVersionOnAppLoad: string,
}

constructor(props) {
export default class VersionBar extends React.PureComponent <Props, State> {
constructor(props:Props) {
super(props);

this.state = {
serverVersionOnAppLoad: props.serverVersion,
};
}

static getDerivedStateFromProps(props, state) {
static getDerivedStateFromProps(props:Props, state:State) {
if (!state.serverVersionOnAppLoad && props.serverVersion) {
return {
serverVersionOnAppLoad: props.serverVersion,
Expand Down