Merge pull request #194 from open-source-labs/staging

gpanciera · web-flow · commit dce6d36cac89 · 2020-07-16T12:17:50.000-05:00
Merge from staging
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/__tests__/MainSlider.test.tsx b/src/app/__tests__/MainSlider.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react/jsx-props-no-spreading */
 import { shallow, configure } from 'enzyme';
 import React from 'react';
@@ -8,7 +9,7 @@ import MainSlider from '../components/MainSlider';
 
 import { useStoreContext } from '../store';
 
-configure({ adapter: new Adapter() });
+configure({ adapter: new (Adapter as any)() });
 
 jest.mock('../store');
 // the handle function in MainSlider returns out a Tooltip Component
diff --git a/src/app/__tests__/PerfView.test.tsx b/src/app/__tests__/PerfView.test.tsx
@@ -1,8 +1,12 @@
+/* eslint-disable max-len */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-var-requires */
 import React from 'react';
 import { configure, shallow } from 'enzyme';
 // import { act } from 'react-dom/test-utils';
 import Adapter from 'enzyme-adapter-react-16';
-const PerfView =  require('../components/PerfView').default
+
+const PerfView = require('../components/PerfView').default;
 // import { iterator } from 'core-js/fn/symbol';
 
 // Unit test cases for PerfView
@@ -103,10 +107,10 @@ describe('PerfView Component ', () => {
 
   const props = {
     viewIndex: -1,
-    snapshots: snapshots,
+    snapshots,
     width: 600,
     height: 600,
-  }
+  };
 
   beforeEach(() => {
     wrapper = shallow(<PerfView viewIndex={props.viewIndex} snapshots={props.snapshots} width={props.width} height={props.height} />);
diff --git a/src/app/__tests__/SwitchApp.test.tsx b/src/app/__tests__/SwitchApp.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import React from 'react';
 import Select from 'react-select';
 import { configure, shallow } from 'enzyme';
@@ -6,7 +7,7 @@ import SwitchApp from '../components/SwitchApp';
 
 import { useStoreContext } from '../store';
 
-configure({ adapter: new Adapter() });
+configure({ adapter: new (Adapter as any)() });
 
 jest.mock('../store');
 
diff --git a/src/app/__tests__/TravelContainer.test.tsx b/src/app/__tests__/TravelContainer.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react/jsx-filename-extension */
 import { shallow, configure } from 'enzyme';
 import React from 'react';
@@ -8,7 +9,7 @@ import Dropdown from '../components/Dropdown';
 import { useStoreContext } from '../store';
 import { moveBackward, moveForward } from '../actions/actions';
 
-configure({ adapter: new Adapter() });
+configure({ adapter: new (Adapter as any)() });
 
 const state = {
   tabs: {
diff --git a/src/app/components/Diff.tsx b/src/app/components/Diff.tsx
@@ -73,7 +73,6 @@ function Diff(props: DiffProps) {
   else formatters.html.hideUnchanged();
 
   if (previous === undefined || delta === undefined) {
-    // console.log('reacthtml parser -->', ReactHtmlParser(html), typeof ReactHtmlParser(html));
     return <div className="no-data-message"> No state change detected. Trigger an event to change state </div>;
   }
   return <div>{ReactHtmlParser(html)}</div>;
diff --git a/src/app/components/PerfView.tsx b/src/app/components/PerfView.tsx
@@ -72,15 +72,11 @@ const PerfView = (props:PerfViewProps) => {
   }, [indexToDisplay, svgRef]);
 
   useEffect(() => {
-    // console.log(`***** useEffect - MAIN -> snapshots[${indexToDisplay}]`, snapshots[indexToDisplay]);
-
     // Error, no App-level component present
     if (snapshots[indexToDisplay].children.length < 1) return;
 
     // Generate tree with our data
     const packedRoot = packFunc(snapshots[indexToDisplay]);
-    // console.log('PerfView -> packedRoot', packedRoot);
-
     // Set initial focus to root node
     let curFocus = packedRoot;
 
@@ -112,7 +108,6 @@ const PerfView = (props:PerfViewProps) => {
         .style('fill-opacity', (d:{parent:object}) => (d.parent === packedRoot ? 1 : 0))
         .style('display', (d:{parent?:object}) => (d.parent === packedRoot ? 'inline' : 'none'))
         .text((d:{data:{name:string, componentData?:{actualDuration:any}}}) => {
-          // console.log("PerfView -> d.data", d.data);
           if (!d.data.componentData.actualDuration) handleNoRenderData(true);
           else handleNoRenderData(false);
           return `${d.data.name}: ${Number.parseFloat(d.data.componentData.actualDuration || 0).toFixed(2)}ms`;
diff --git a/src/app/reducers/mainReducer.js b/src/app/reducers/mainReducer.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable prefer-const */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable no-param-reassign */
 import produce from 'immer';
@@ -24,14 +26,12 @@ export default (state, action) => produce(state, draft => {
     }
 
     const objChildArray = [];
-    // eslint-disable-next-line no-restricted-syntax
     if (obj) {
-      for (const objChild of obj.children) {
+      for (let objChild of obj.children) {
         objChildArray.push(findName(index, objChild));
       }
     }
-    // eslint-disable-next-line no-restricted-syntax
-    for (const objChildName of objChildArray) {
+    for (let objChildName of objChildArray) {
       if (objChildName) {
         return objChildName;
       }
diff --git a/src/app/types/AppTypes.ts b/src/app/types/AppTypes.ts
diff --git a/src/backend/__tests__/astParser.test.js b/src/backend/__tests__/astParser.test.js
@@ -57,69 +57,3 @@ describe('AST Unit Tests', () => {
     });
   });
 });
-
-/* /*
-console.log('getHooksNames: ', getHooksNames(`function LastSnapshot(props) {
-  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_0__["useState"])(''),
-      _useState2 = _slicedToArray(_useState, 2),
-      currentSnapshot = _useState2[0],
-      setCurrentSnapshot = _useState2[1];
-
-  var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_0__["useState"])(25),
-      _useState4 = _slicedToArray(_useState3, 2),
-      testState = _useState4[0],
-      setTestState = _useState4[1];
-
-  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_0__["useState"])(50),
-      _useState6 = _slicedToArray(_useState5, 2),
-      testState2 = _useState6[0],
-      setTestState2 = _useState6[1];
-
-  function replacer(name, val) {
-    // Ignore the key that is the name of the state variable
-    if (name === 'currentSnapshot') {
-      console.log('filtering currentSnapshot from display');
-      return undefined;
-    }
-
-    return val;
-  }
-
-  Object(react__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(function () {
-    window.addEventListener('message', function (_ref) {
-      var _ref$data = _ref.data,
-          action = _ref$data.action,
-          payload = _ref$data.payload;
-
-      if (action === 'recordSnap') {
-        console.log('stringifying payload:', payload);
-        var payloadContent = JSON.stringify(payload, replacer, 1);
-        setCurrentSnapshot(payloadContent);
-        setTestState(function (state) {
-          return state * 2;
-        });
-        setTestState2(function (state) {
-          return state * 2;
-        });
-        console.log('current snapshot', currentSnapshot);
-      }
-    });
-  }, []);
-  /*
-  // This method is for testing. Setting state after the activeSandbox is changed modifies the overall behavior of the sandbox environment.
-  const { activeSandbox } = props;
-  useEffect(() => {
-    // Reset the current snapshot when a new sandbox is entered
-    setCurrentSnapshot('');
-  }, [activeSandbox]);
-  */
-/*
- return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-  id: "lastSnapshot",
-  className: "ml-5 mt-2",
-  style: {
-    whiteSpace: 'pre'
-  }
-}, testState, testState2, currentSnapshot));
-};`));
-*/
diff --git a/src/backend/__tests__/linkFiber.test.tsx b/src/backend/__tests__/linkFiber.test.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable react/state-in-constructor */
+/* eslint-disable lines-between-class-members */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable import/order */
@@ -21,6 +23,7 @@ let browser;
 let page;
 
 class App extends Component {
+  state: { foo: string; };
   constructor(props) {
     super(props);
     this.state = { foo: 'bar' };
diff --git a/src/backend/__tests__/puppeteerServer.js b/src/backend/__tests__/puppeteerServer.js
@@ -9,6 +9,5 @@ const app = express();
 app.use(express.static(path.resolve(__dirname)));
 
 const server = app.listen(5000);
-// () => {console.log('Express listening on port 5000');}
 
 module.exports = server;
diff --git a/src/backend/__tests__/timeJump.test.ts b/src/backend/__tests__/timeJump.test.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable max-classes-per-file */
diff --git a/src/backend/helpers.js b/src/backend/helpers.js
@@ -50,7 +50,7 @@ export const getHooksNames = elementType => {
   let ast;
   try {
     ast = JSXParser.parse(elementType);
-  } catch(e) {
+  } catch (e) {
     return ['unknown'];
   }
   const hookState = {};
diff --git a/src/backend/index.d.ts b/src/backend/index.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable quotes */
 // Type definitions for reactime v3.1
 // Project: <https://github.com/open-source-labs/reactime>
 // Definitions by: Abaas Khorrami <https://github.com/dubalol>
diff --git a/src/backend/linkFiber.ts b/src/backend/linkFiber.ts
@@ -252,15 +252,5 @@ export default (snap: Snapshot, mode: Mode): ()=>void => {
     }
 
     throttledUpdateSnapshot();
-
-    // updateSnapShotTree();
-    // Send the initial snapshot once the content script has started up
-    // This message is sent from contentScript.js in chrome extension bundles
-    // window.addEventListener('message', ({ data: { action } }) => {
-    //   if (action === 'contentScriptStarted') {
-    //     // console.log('content script started received at linkFiber.js')
-    //     sendSnapshot();
-    //   }
-    // });
   };
 };
diff --git a/src/backend/puppeteerServer.js b/src/backend/puppeteerServer.js
@@ -9,6 +9,5 @@ const app = express();
 app.use(express.static(path.resolve(__dirname)));
 
 const server = app.listen(5000);
-// () => {console.log('Express listening on port 5000');}
 
 module.exports = server;
diff --git a/src/backend/tree.ts b/src/backend/tree.ts
@@ -1,3 +1,6 @@
+/* eslint-disable no-plusplus */
+/* eslint-disable max-len */
+/* eslint-disable @typescript-eslint/ban-types */
 import 'core-js';
 /* eslint-disable no-multiple-empty-lines */
 /* eslint-disable max-classes-per-file */
@@ -23,7 +26,7 @@ function serializeState(state) {
     return JSON.parse(JSON.stringify(state));
   } catch (e) {
     return 'circularState';
-  };
+  }
 }
 
 /**
diff --git a/src/backend/types/backendTypes.ts b/src/backend/types/backendTypes.ts
@@ -1,3 +1,6 @@
+/* eslint-disable linebreak-style */
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import Tree from '../tree';
 
 export interface Snapshot{
@@ -40,7 +43,7 @@ interface HookStateItem {
   component: any;
 }
 
-export interface HookStates extends Array<HookStateItem> {}
+export type HookStates = Array<HookStateItem>
 
 export interface State {
   state?: {} | number;
@@ -170,4 +173,4 @@ export type Fiber = {
   // This value bubbles up during the "complete" phase.
   // This field is only set when the enableProfilerTimer flag is enabled.
   treeBaseDuration?: number,
-};
+};
diff --git a/tests/automated-tests/Backend/server.js b/tests/automated-tests/Backend/server.js
@@ -6,6 +6,5 @@ const app = express();
 app.use(express.static(path.resolve(__dirname, '../', 'Frontend', 'public')));
 
 const server = app.listen(3000);
-// () => {console.log('Express listening on port 3000');}
 
 module.exports = server;
diff --git a/tests/automated-tests/hooks-redux-router/Frontend/src/scenes/lastSnapshot.js b/tests/automated-tests/hooks-redux-router/Frontend/src/scenes/lastSnapshot.js
@@ -16,7 +16,6 @@ const LastSnapshot = props => {
   function replacer(name, val) {
     // Ignore the key that is the name of the state variable
     if (name === 'currentSnapshot') {
-      console.log('filtering currentSnapshot from display');
       return undefined;
     }
 
@@ -26,12 +25,10 @@ const LastSnapshot = props => {
   useEffect(() => {
     window.addEventListener('message', ({ data: { action, payload } }) => {
       if (action === 'recordSnap') {
-        console.log('stringifying payload:', payload);
         const payloadContent = JSON.stringify(payload, replacer, 1);
         setCurrentSnapshot(payloadContent);
         setTestState((state) => state*2);
         setTestState2((state) => state*2);
-        console.log('current snapshot', currentSnapshot);
       }
     });
   }, []);

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ function Diff(props: DiffProps) {`
`73`	`73`	`else formatters.html.hideUnchanged();`
`74`	`74`
`75`	`75`	`if (previous === undefined \|\| delta === undefined) {`
`76`		`- // console.log('reacthtml parser -->', ReactHtmlParser(html), typeof ReactHtmlParser(html));`
`77`	`76`	`return <div className="no-data-message"> No state change detected. Trigger an event to change state </div>;`
`78`	`77`	`}`
`79`	`78`	`return <div>{ReactHtmlParser(html)}</div>;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* eslint-disable no-restricted-syntax */`
	`2`	`+/* eslint-disable prefer-const */`
`1`	`3`	`/* eslint-disable @typescript-eslint/explicit-module-boundary-types */`
`2`	`4`	`/* eslint-disable no-param-reassign */`
`3`	`5`	`import produce from 'immer';`
`@@ -24,14 +26,12 @@ export default (state, action) => produce(state, draft => {`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`const objChildArray = [];`
`27`		`- // eslint-disable-next-line no-restricted-syntax`
`28`	`29`	`if (obj) {`
`29`		`- for (const objChild of obj.children) {`
	`30`	`+ for (let objChild of obj.children) {`
`30`	`31`	`objChildArray.push(findName(index, objChild));`
`31`	`32`	`}`
`32`	`33`	`}`
`33`		`- // eslint-disable-next-line no-restricted-syntax`
`34`		`- for (const objChildName of objChildArray) {`
	`34`	`+ for (let objChildName of objChildArray) {`
`35`	`35`	`if (objChildName) {`
`36`	`36`	`return objChildName;`
`37`	`37`	`}`