Merge branch 'dev' into brian/feature

Author: yangbrian310

src/app/__tests__/RouteDescription.test.tsx

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react/jsx-filename-extension */
 
@@ -11,7 +10,7 @@ import RouteDescription from '../components/RouteDescription';
 configure({ adapter: new (Adapter as any)() });
 
 describe('Unit testing RouteDescription', () => {
-  const actionsArr = [];
+  const actionsArr: JSX.Element[] = [];
 
   actionsArr.push(
     <Action

src/app/components/Action.tsx

@@ -20,8 +20,9 @@ interface ActionProps {
   displayName: string;
   componentName: string;
   componentData: { actualDuration: number } | undefined;
+  routePath: any;
   state?: Record<string, unknown>;
-  viewIndex: number;
+  viewIndex: number | undefined;
   isCurrIndex: boolean;
   handleOnkeyDown: (e: any, i: number) => any;
 }

src/app/components/Loader.tsx

@@ -1,7 +1,5 @@
 /* eslint-disable react/prop-types */
 
-// @ts-nocheck
-
 import React from 'react';
 import { css } from '@emotion/react';
 import { ClipLoader } from 'react-spinners';

src/app/components/Tutorial.tsx

@@ -1,28 +1,36 @@
-// @ts-nocheck
+/* eslint-disable react/sort-comp */
+/* eslint-disable lines-between-class-members */
+/* eslint-disable react/static-property-placement */
+//@ts-nocheck
 import * as React from 'react';
 import { Component } from 'react';
 import { Steps } from 'intro.js-react';
 import 'intro.js/introjs.css';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faQuestion } from '@fortawesome/free-solid-svg-icons';
 import { tutorialSaveSeriesToggle, setCurrentTabInApp } from '../actions/actions';
-import { element } from 'prop-types';
+
+interface tutorialProps {
+  dispatch: unknown;
+  currentTabInApp: unknown;
+}
 
 // This is the tutorial displayed when the "How to use" button is clicked
 // This needs to be a class component to be compatible with updateStepElement from intro.js
-class Tutorial extends Component {
-  constructor(props) {
+export default class Tutorial extends React.Component<tutorialProps> {
+  constructor(props:tutorialProps) {
     super(props);
     this.state = {
       stepsEnabled: false,
     };
   }
 
-  render() {
+  public props: tutorialProps;
+  render(): JSX.Element {
     const { currentTabInApp, dispatch } = this.props;
-    
+
     // This updates the steps so that they can target dynamically rendered elements
-    const onChangeHandler = (currentStepIndex: Number) => {
+    const onChangeHandler = (currentStepIndex: number) => {
       if (currentTabInApp === 'performance' && currentStepIndex === 1) {
         dispatch(tutorialSaveSeriesToggle('inputBoxOpen'));
         this.steps.updateStepElement(currentStepIndex);
@@ -58,15 +66,14 @@ class Tutorial extends Component {
     };
 
     interface stepsObj {
-      title: String,
-      element?: String,
-      intro: String,
-      position: String,
+      title: string,
+      element?: string,
+      intro: string,
+      position: string,
     }
 
     let steps: stepsObj[] = [];
 
-  
     switch (currentTabInApp) {
       case 'map':
         steps = [{
@@ -210,9 +217,6 @@ class Tutorial extends Component {
         break;
     }
 
-   
-
-
     return (
       <>
         <Steps
@@ -250,5 +254,3 @@ class Tutorial extends Component {
     );
   }
 }
-
-export default Tutorial;

src/app/containers/ActionContainer.tsx

@@ -1,4 +1,4 @@
-// @ts-nocheck
+/* eslint-disable max-len */
 import React, { useEffect, useState } from 'react';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -34,7 +34,10 @@ function ActionContainer(props): JSX.Element {
 
   // function to traverse state from hierarchy and also getting information on display name and component name
   const displayArray = (obj: {
-    stateSnapshot: { children: any[] };
+    stateSnapshot: {
+      route: any,
+      children: any[]
+    };
     name: number;
     branch: number;
     index: number;
@@ -97,6 +100,7 @@ function ActionContainer(props): JSX.Element {
   actionsArr = hierarchyArr.map(
     (
       snapshot: {
+        routePath: any;
         state?: Record<string, unknown>;
         index: number;
         displayName: string;

src/app/containers/ButtonsContainer.tsx

@@ -31,18 +31,18 @@ function exportHandler(snapshots: []) {
   URL.revokeObjectURL(fileDownload.href);
 }
 
-function importHandler(dispatch: (a: any) => void) {
+function importHandler(dispatch: (a: unknown) => void) {
   const fileUpload = document.createElement('input');
   fileUpload.setAttribute('type', 'file');
 
-  fileUpload.onchange = () => {
+  fileUpload.onchange = (e) => {
     const reader = new FileReader();
     reader.onload = () => {
       const test = reader.result.toString();
       return dispatch(importSnapshots(JSON.parse(test)));
     };
-    if (event.target.hasOwnProperty('files')) {
-      const eventFiles: any = event.target;
+    if (e.target.hasOwnProperty('files')) {
+      const eventFiles: unknown = e.target;
       reader.readAsText(eventFiles.files[0]);
     }
   };

src/app/containers/MainContainer.tsx

@@ -58,7 +58,8 @@ function MainContainer(): JSX.Element {
         let maxTab: number;
         if (!sourceTab) {
           const tabsArray: Array<string> = Object.keys(payload);
-          maxTab = Math.max(...tabsArray);
+          const numTabsArray: number[] = tabsArray.map(tab => Number(tab));
+          maxTab = Math.max(...numTabsArray);
         }
         switch (action) {
           case 'deleteTab': {

src/app/containers/TravelContainer.tsx

@@ -1,4 +1,4 @@
-// @ts-nocheck
+/* eslint-disable max-len */
 import React, { useState } from 'react';
 import MainSlider from '../components/MainSlider';
 import Dropdown from '../components/Dropdown';

src/backend/__tests__/linkFiber.test.tsx

@@ -24,16 +24,15 @@ let snapShot;
 
 let browser;
 let page;
-interface Component {
-  render(): any;
-  context: any;
-  setState: any;
-  forceUpdate: any;
-  props: any;
-  state: any;
-  refs: any;
-}
-
+// interface Component {
+//   render(): any;
+//   context: any;
+//   setState: any;
+//   forceUpdate: any;
+//   props: any;
+//   state: any;
+//   refs: any;
+// }
 
 class App extends Component{
   state: { foo: string; };
@@ -106,4 +105,4 @@ xdescribe('unit test for linkFiber', () => {
   });
 });
 
-SERVER.close();
+SERVER.close();

src/backend/index.d.ts

@@ -13,23 +13,27 @@
  * Reactime contributors:
     "Abaas Khorrami",
     "Andy Wong",
+    "Brian Yang",
     "Bryan Lee",
     "Carlos Perez",
     "Chris Flannery",
     "David Chai",
     "Edwin Menendez",
+    "Emin Tahirov",
     "Ergi Shehu",
     "Gabriela Jardim Aquino",
     "Gregory Panciera",
     "Josh Kim",
     "Joshua Howard",
+    "Louis Lam",
     "Nathanael Wa Mwenze",
     "Prasanna Malla",
     "Rajeeb Banstola",
     "Raymond Kwan",
     "Rocky Lin",
     "Ruth Anam",
     "Ryan Dang",
+    "Samuel Tran",
     "Sierra Swaby",
     "Yujin Kang"
  *