Merge pull request #321 from labzero/jeffrey/flash-error

Convert ErrorPage and Flash to TypeScript

src/components/ErrorPage/ErrorPage.js → src/components/ErrorPage/ErrorPage.tsx

@@ -7,12 +7,15 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
-import PropTypes from "prop-types";
 import React from "react";
 import withStyles from "isomorphic-style-loader/withStyles";
 import s from "./ErrorPage.scss";
 
-export const ErrorPage = ({ error }) => {
+interface ErrorPageProps {
+  error: { stack: string; status: number };
+}
+
+export const ErrorPage = ({ error }: ErrorPageProps) => {
   let title = "Error";
   let content = "Sorry, a critical error occurred on this page.";
   let errorMessage = null;
@@ -33,7 +36,5 @@ export const ErrorPage = ({ error }) => {
   );
 };
 
-ErrorPage.propTypes = { error: PropTypes.object.isRequired };
-
 export { ErrorPage as ErrorPageWithoutStyle };
 export default withStyles(s)(ErrorPage);

src/components/Flash/Flash.js → src/components/Flash/Flash.tsx

@@ -1,16 +1,15 @@
-import PropTypes from "prop-types";
 import React, { Component } from "react";
 import withStyles from "isomorphic-style-loader/withStyles";
 // eslint-disable-next-line css-modules/no-unused-class
 import s from "./Flash.scss";
 
-class Flash extends Component {
-  static propTypes = {
-    expireFlash: PropTypes.func.isRequired,
-    message: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-  };
+interface FlashProps {
+  expireFlash: () => void;
+  message: string;
+  type: keyof typeof s;
+}
 
+class Flash extends Component<FlashProps> {
   componentDidMount() {
     setTimeout(this.props.expireFlash, 5000);
   }

src/components/Flash/FlashContainer.js → src/components/Flash/FlashContainer.ts

@@ -1,8 +1,9 @@
 import { connect } from "react-redux";
 import Flash from "./Flash";
 import { expireFlash } from "../../actions/flash";
+import { Dispatch } from "../../interfaces";
 
-const mapDispatchToProps = (dispatch, ownProps) => ({
+const mapDispatchToProps = (dispatch: Dispatch, ownProps: { id: string }) => ({
   expireFlash: () => {
     dispatch(expireFlash(ownProps.id));
   },