100% - Conv all the things to tsx

Signed-off-by: Joe Farro <[email protected]>

packages/jaeger-ui/src/components/App/NotFound.js → packages/jaeger-ui/src/components/App/NotFound.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +19,7 @@ import ErrorMessage from '../common/ErrorMessage';
 import prefixUrl from '../../utils/prefix-url';
 
 type NotFoundProps = {
-  error: any,
+  error: any;
 };
 
 export default function NotFound({ error }: NotFoundProps) {

packages/jaeger-ui/src/components/App/Page.js → packages/jaeger-ui/src/components/App/Page.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,35 +17,32 @@ import { Layout } from 'antd';
 import cx from 'classnames';
 import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { RouteComponentProps, withRouter } from 'react-router-dom';
 
 import TopNav from './TopNav';
+import { ReduxState } from '../../types';
+import { EmbeddedState } from '../../types/embedded';
 import { trackPageView } from '../../utils/tracking';
 
-import type { ReduxState } from '../../types';
-import type { EmbeddedState } from '../../types/embedded';
-
 import './Page.css';
 
-type Props = {
-  children: React.Node,
-  embedded: EmbeddedState,
-  pathname: string,
-  search: string,
+type TProps = RouteComponentProps<any> & {
+  children: React.ReactNode;
+  embedded: EmbeddedState;
+  pathname: string;
+  search: string;
 };
 
 const { Header, Content } = Layout;
 
 // export for tests
-export class PageImpl extends React.Component<Props> {
-  props: Props;
-
+export class PageImpl extends React.Component<TProps> {
   componentDidMount() {
     const { pathname, search } = this.props;
     trackPageView(pathname, search);
   }
 
-  componentWillReceiveProps(nextProps: Props) {
+  componentWillReceiveProps(nextProps: TProps) {
     const { pathname, search } = this.props;
     const { pathname: nextPathname, search: nextSearch } = nextProps;
     if (pathname !== nextPathname || search !== nextSearch) {

packages/jaeger-ui/src/components/TraceDiff/index.js → packages/jaeger-ui/src/components/TraceDiff/index.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

packages/jaeger-ui/src/components/TracePage/ArchiveNotifier/index.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

packages/jaeger-ui/src/utils/DraggableManager/demo/DividerDemo.js → packages/jaeger-ui/src/utils/DraggableManager/demo/DividerDemo.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,23 +14,21 @@
 
 import React from 'react';
 
+import { DraggableBounds, DraggingUpdate } from '..';
 import DraggableManager from '../DraggableManager';
-
-import type { DraggableBounds, DraggingUpdate } from '..';
+import TNil from '../../../types/TNil';
 
 import './DividerDemo.css';
 
 type DividerDemoProps = {
-  position: number,
-  updateState: ({}) => void,
+  position: number;
+  updateState: (udpate: { dividerPosition: number }) => void;
 };
 
 export default class DividerDemo extends React.PureComponent<DividerDemoProps> {
-  props: DividerDemoProps;
-
   _dragManager: DraggableManager;
 
-  _realmElm: ?Element;
+  _realmElm: HTMLElement | TNil;
 
   constructor(props: DividerDemoProps) {
     super(props);
@@ -47,7 +43,7 @@ export default class DividerDemo extends React.PureComponent<DividerDemoProps> {
     });
   }
 
-  _setRealm = (elm: ?Element) => {
+  _setRealm = (elm: HTMLElement | TNil) => {
     this._realmElm = elm;
   };
 

packages/jaeger-ui/src/utils/DraggableManager/demo/DraggableManagerDemo.js → packages/jaeger-ui/src/utils/DraggableManager/demo/DraggableManagerDemo.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,25 +16,20 @@ import React from 'react';
 
 import DividerDemo from './DividerDemo';
 import RegionDemo from './RegionDemo';
+import { TNil } from '../../../types';
 
 import './DraggableManagerDemo.css';
 
-type DraggableManagerDemoProps = {};
-
-type DraggableManagerDemoState = {
-  dividerPosition: number,
-  regionCursor: ?number,
-  regionDragging: ?[number, number],
+export type DraggableManagerDemoState = {
+  dividerPosition: number;
+  regionCursor: number | TNil;
+  regionDragging: [number, number] | TNil;
 };
 
-export default class DraggableManagerDemo extends React.PureComponent<
-  DraggableManagerDemoProps,
-  DraggableManagerDemoState
-> {
-  props: DraggableManagerDemoProps;
+export default class DraggableManagerDemo extends React.PureComponent<{}, DraggableManagerDemoState> {
   state: DraggableManagerDemoState;
 
-  constructor(props: DraggableManagerDemoProps) {
+  constructor(props: {}) {
     super(props);
     this.state = {
       dividerPosition: 0.25,

packages/jaeger-ui/src/utils/DraggableManager/demo/RegionDemo.js → packages/jaeger-ui/src/utils/DraggableManager/demo/RegionDemo.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,24 +14,26 @@
 
 import React from 'react';
 
-import DraggableManager from '..';
-
-import type { DraggableBounds, DraggingUpdate } from '..';
+import DraggableManager, { DraggableBounds, DraggingUpdate } from '..';
+import { TNil } from '../../../types';
 
 import './RegionDemo.css';
 
+type TUpdate = {
+  regionCursor?: number | null;
+  regionDragging?: number[] | null;
+};
+
 type RegionDemoProps = {
-  regionCursor: ?number,
-  regionDragging: ?[number, number],
-  updateState: ({}) => void,
+  regionCursor: number | TNil;
+  regionDragging: [number, number] | TNil;
+  updateState: (update: TUpdate) => void;
 };
 
 export default class RegionDemo extends React.PureComponent<RegionDemoProps> {
-  props: RegionDemoProps;
-
   _dragManager: DraggableManager;
 
-  _realmElm: ?Element;
+  _realmElm: HTMLElement | TNil;
 
   constructor(props: RegionDemoProps) {
     super(props);
@@ -50,7 +50,7 @@ export default class RegionDemo extends React.PureComponent<RegionDemoProps> {
     });
   }
 
-  _setRealm = (elm: ?Element) => {
+  _setRealm = (elm: HTMLElement | TNil) => {
     this._realmElm = elm;
   };
 

packages/jaeger-ui/src/utils/DraggableManager/demo/index.js → packages/jaeger-ui/src/utils/DraggableManager/demo/index.tsx

@@ -1,5 +1,3 @@
-// @flow
-
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

packages/jaeger-ui/tsconfig.json

@@ -20,6 +20,5 @@
     // Required by CRA
     "isolatedModules": true
   },
-  "exclude": ["src/**/*.js"],
   "include": ["src/**/*.tsx", "typings"]
 }

packages/jaeger-ui/typings/custom.d.ts

@@ -41,5 +41,6 @@ declare module 'combokeys' {
   }
 }
 
+declare module 'react-helmet';
 declare module 'json-markup';
 declare module 'tween-functions';