migration

Author: MacKentoch

front/src/hoc/withMainLayout/index.js front/src/hoc/withMainLayout/index.tsfront/src/hoc/withMainLayout/index.js renamed to front/src/hoc/withMainLayout/index.ts

@@ -1,8 +1,5 @@
-// @flow
-
-// #region imports
 import { compose } from 'redux';
 import withMainLayout from './withMainLayout';
-// #endregion
+
 
 export default compose()(withMainLayout);

…src/hoc/withMainLayout/withMainLayout.js …rc/hoc/withMainLayout/withMainLayout.tsxfront/src/hoc/withMainLayout/withMainLayout.js renamed to front/src/hoc/withMainLayout/withMainLayout.tsx front/src/hoc/withMainLayout/withMainLayout.js renamed to front/src/hoc/withMainLayout/withMainLayout.tsx

@@ -1,39 +1,27 @@
-// @flow
-
-// #region imports
 import React, { Component } from 'react';
+// @ts-ignore
 import wrapDisplayName from 'recompose/wrapDisplayName';
-import {compose} from 'redux';
+import { compose } from 'redux';
 import { withRouter } from 'react-router';
-import { type Match, type Location, type RouterHistory } from 'react-router';
+import { RouteChildrenProps } from 'react-router';
 import Container from 'reactstrap/lib/Container';
 import NavigationBar from '../../components/navigation';
 import BackToTop from '../../components/backToTop/BackToTop';
 import navigationModel from '../../config/navigation';
-import { type Navigation } from '../../config/navigation';
+import { Navigation } from '../../config/navigation';
 import registerServiceWorker from '../../services/sw/registerServiceWorker';
-// #endregion
 
-// #region flow types
-type Props = {
-  // from withRouter HOC:
-  match: Match,
-  location: Location,
-  history: RouterHistory,
-
-  ...any,
-};
+// #region types
+type Props = {} & RouteChildrenProps;
 
 type State = {
-  navModel: Navigation,
-
-  ...any,
+  navModel: Navigation;
 };
 // #endregion
 
 // #region withMainLayout HOC
 function withMainLayout(/* no args option yet, but could pass them here */) {
-  return BaseComponent => {
+  return (BaseComponent: any) => {
     // #region returned Component
     class WithMainLayout extends Component<Props, State> {
       state = { navModel: navigationModel };
@@ -68,20 +56,22 @@ function withMainLayout(/* no args option yet, but could pass them here */) {
       // #endregion
 
       /* eslint-disable no-unused-vars*/
-      handleLeftNavItemClick = (event: SyntheticEvent<>, viewName: string) => {
+      handleLeftNavItemClick = (event: any, viewName: string) => {
         // something to do here?
       };
 
-      handleRightNavItemClick = (event: SyntheticEvent<>, viewName: string) => {
+      handleRightNavItemClick = (event: any, viewName: string) => {
         // something to do here?
       };
       /* eslint-enable no-unused-vars*/
     }
 
     // #region add static displayName for dev
     /* eslint-disable no-process-env */
+    // @ts-ignore
     if (process.env.NODE_ENV !== 'production') {
       // HOC would obfuscate component name, this trick is helpful for dev (we don't care in production)
+      // @ts-ignore
       WithMainLayout.displayName = wrapDisplayName(
         BaseComponent,
         'withMainLayout',
@@ -90,6 +80,7 @@ function withMainLayout(/* no args option yet, but could pass them here */) {
     /* eslint-enable no-process-env */
     // #endregion
 
+    // @ts-ignore
     return compose(withRouter)(WithMainLayout);
   };
 }

…s/getLocationOrigin/getLocationOrigin.js …s/getLocationOrigin/getLocationOrigin.tsfront/src/services/getLocationOrigin/getLocationOrigin.js renamed to front/src/services/getLocationOrigin/getLocationOrigin.ts front/src/services/getLocationOrigin/getLocationOrigin.js renamed to front/src/services/getLocationOrigin/getLocationOrigin.ts

@@ -1,7 +1,6 @@
-// @flow
-
 export const getLocationOrigin = (): string => {
   if (!window.location.origin) {
+    // @ts-ignore
     window.location.origin = `${window.location.protocol}//${
       window.location.hostname
     }${window.location.port ? ':' + window.location.port : ''}`;

…src/services/sw/registerServiceWorker.js …src/services/sw/registerServiceWorker.tsfront/src/services/sw/registerServiceWorker.js renamed to front/src/services/sw/registerServiceWorker.ts front/src/services/sw/registerServiceWorker.js renamed to front/src/services/sw/registerServiceWorker.ts

@@ -1,8 +1,4 @@
-// @flow
-
-// #region  imports
 import appConfig from '../../config/appConfig';
-// #endregion
 
 // #region constants
 const { path: swPath } = appConfig.sw;
@@ -12,7 +8,6 @@ function registerServiceWorker(): void {
   if (typeof window !== undefined) {
     if ('serviceWorker' in navigator) {
       window.addEventListener('load', () => {
-        // $FlowIgnore
         navigator.serviceWorker
           .register(swPath)
           .then(registration => {