Merge branch 'master' into map

Author: kevinfey

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tests/manual-tests/recoilTest"]
+	path = tests/manual-tests/recoilTest
+	url = https://github.com/kevinfey/recoilTest

.travis.yml

@@ -1,4 +1,14 @@
-services:
-  - docker
+language: node_js
+node_js:
+  - 12
+dist: trusty
+cache: npm
+git:
+  submodules: false
+# branches:
+#   only:
+#   - implementtravisci
+install:
+  - npm install
 script:
-  - docker-compose up --abort-on-container-exit
+  - npm run test

package.json

@@ -15,7 +15,7 @@
   "scripts": {
     "build": "webpack --mode production",
     "dev": "webpack --mode development --watch",
-    "test": "jest --verbose --coverage --watchAll --runInBand --detectOpenHandles --forceExit",
+    "test": "jest --verbose --coverage --watchAll --forceExit",
     "docker-test-lint": "eslint --ext .js --ext .jsx src",
     "docs": "typedoc --json docs --inputFiles src/app --inputFiles src/backend --readme docs/readme.md"
   },

readme_2.md

@@ -1,33 +1,98 @@
-This documentation explains the architecture of Reactime v4.
+# Reactime v4 Architecture
 
+## Brief
+Our mission at Reactime is to maintain and iterate constantly, but never at the expense of future developers.<br />We know how hard it is to quickly get up to speed and onboard in a new codebase.<br />So, here are some helpful pointers to help you hit the ground running. 🏃🏾💨
 
-![demo](./AppStructureDiagram.png)
+### Main Structure
+
+In the *src* folder, there are three directories we care about: *app*, *backend*, and *extension*. 
+```
+src/
+├── app/                      # Frontend code
+│   │                         #
+│   ├── __tests__/            #
+│   ├── actions/              # Redux action creators
+│   ├── components/           # React components
+│   ├── constants/            #
+│   ├── containers/           # More React components
+│   ├── reducers/             # Redux mechanism for updating state
+│   ├── styles/               #
+│   ├── index.tsx             # App component 
+│   ├── module.d.ts           #
+│   └── store.tsx             #
+│
+├── backend/                  # "Backend" code
+│   │                         #
+│   ├── __tests__/            #
+│   ├── types/                # Typescript interfaces
+│   ├── helpers.js            # 
+│   ├── index.ts              # Starting point for backend functionality 
+│   ├── index.d.ts            # 
+│   ├── linkFiber.ts          # 
+│   ├── masterState.js        # Component action record interface
+│   ├── module.d.ts           #
+│   ├── package.json          #
+│   ├── puppeteerServer.js    #
+│   ├── readme.md             # 
+│   ├── timeJump.ts           # Rerenders DOM based on snapshot from background
+│   └── tree.ts               # Custom structure to send to background
+│
+├── extension/                # Chrome Extension code
+│   │                         #
+│   ├── build/                # Destination for bundles
+│   │                         # and manifest.json (Chrome config file)
+│   │                         #
+│   ├── background.js         # 
+│   └── contentScript.ts      # 
+└──
+```
 
-In the src folder, there are three directories: app, backend, and extension. 
+1. The *app* folder is responsible for the Single Page Application that you see when you open the chrome dev tools under the Reactime tab. 
 
+2. The *backend* folder contains the set of all scripts that we inject into our "target" application via `background.js`
+    - In Reactime, its main role is to generate data and handle time-jump requests from the background script in our *extension* folder.
 
-The app folder is responsible a SPA that you see when you open the chrome dev tools under the Reactime tab. 
+3. The *extension* folder is where the `contentScript.js` and `background.js` are located. 
+    - Like regular web apps, Chrome Extensions are event-based. The background script is where one typically monitors for browser triggers (e.g. events like closing a tab, for example). The content script is what allows us to read or write to our target web application, usually as a result of [messages passed](https://developer.chrome.com/extensions/messaging) from the background script.
+    - These two files help us handle requests both from the web browser and from the Reactime extension itself
 
-The backend folder is responsible for generating data and handle time-jump request from the background.js scripts in extension. 
+Still unsure about what contents scripts and background scripts do for Reactime, or for a chrome extensions in general?
+  - The implementation details [can be found](./src/extension/background.js) [in the files](./src/extension/contentScript.ts) themselves.
+  - We also encourage you to dive into [the official Chrome Developer Docs](https://developer.chrome.com/home). Some relevant sections are reproduced below:
 
-The extension folder is where the contentscript.js and background.js located. These two files belongs to Chrome internal to help us handle requests both from the web browser and from the chrome dev tools. Unsure what contentscripts and backgroundscripts are? The details implementation are documented in the files themselves. 
+> Content scripts are files that run in the context of web pages. 
+>
+> By using the standard Document Object Model (DOM), they are able to **read** details of the web pages the browser visits, **make changes** to them and **pass information back** to their parent extension. ([Source](https://developer.chrome.com/extensions/content_scripts))
 
-> Content scripts are files that run in the context of web pages. By using the standard Document Object Model (DOM), they are able to read details of the web pages the browser visits, make changes to them and pass information to their parent extension. Source: https://developer.chrome.com/extensions/content_scripts
+- One helpful way to remember a content script's role in the Chrome ecosystem is to think: a *content* script is used to read and modify a target web page's rendered *content*. 
 
->A background page is loaded when it is needed, and unloaded when it goes idle. Some examples of events include:
+>A background page is loaded when it is needed, and unloaded when it goes idle.
+>
+> Some examples of events include:
 >The extension is first installed or updated to a new version.
 >The background page was listening for an event, and the event is dispatched.
 >A content script or other extension sends a message.
->Another view in the extension, such as a popup, calls runtime.getBackgroundPage.
->Once it has been loaded, a background page will stay running as long as it is performing an action, such as calling a Chrome API or issuing a network request. Additionally, the background page will not unload until all visible views and all message ports are closed. Note that opening a view does not cause the event page to load, but only prevents it from closing once loaded. Source: https://developer.chrome.com/extensions/background_pages
+>Another view in the extension, such as a popup, calls `runtime.getBackgroundPage`.
+> 
+>Once it has been loaded, a background page will stay running as long as it is performing an action, such as calling a Chrome API or issuing a network request.
+>
+> Additionally, the background page will not unload until all visible views and all message ports are closed. Note that opening a view does not cause the event page to load, but only prevents it from closing once loaded. ([Source](https://developer.chrome.com/extensions/background_pages))
+
+- You can think of background scripts serving a purpose analogous to that of a **server** in the client/server paradigm. Much like a server, our `background.js` listens constantly for messages (i.e. requests) from two main places:
+  1. The content script
+  2. The chrome extension "front-end" **(*NOT* the interface of the browser, this is an important distinction.)** 
+- In other words, a background script works as a sort of middleman, directly maintaining connection with its parent extension, and acting as a proxy enabling communication between it and the content script. 
 
-Just to reiterate, contentscript is use to read and modify information that is rendered on the webpage, and a host of other objects. Background is very similar to client/server concept in which background is behaving like a server, listening to request from the contentscipt and **the request from the "front-end" of the chrome dev tools in the reactime tab (not the interface of the browser, this is an important distinction.)** In other words, background script works directly with the React Dev Tools, whereas contentscript works with the interface of the browser.
+
+### Data Flow
 
 The general flow of data is described in the following steps:
 
-1. When the background bundle is loaded from the browser, it injects a script into the dom. This script uses a technique called [throttle](https://medium.com/@bitupon.211/debounce-and-throttle-160affa5457b) to get the data of the state of the app to send to the contentscript every specified miliseconds (in our case, it's 70ms).
+![demo](./AppStructureDiagram.png)
 
+1. When the background bundle is loaded by the browser, it executes a script injection into the dom. (see section on *backend*). This script uses a technique called [throttle](https://medium.com/@bitupon.211/debounce-and-throttle-160affa5457b) to send state data from the app to the content script every specified milliseconds (in our case, this interval is 70ms).
 
-2. This contentscript always listens to the messages being sent from the interface of the browser. The recieved data will immediately be sent to the background script which then update an object that persist in background script called **tabsObj**. Each time tabsObj is updated, the most recent version will be sent to the interface of reactime dev tools written the app folder.
+2. The content script always listens for messages being passed from the extension's target application. Upon receiving data from the target app, the content script will immediately forward this data to the background script which then updates an object called `tabsObj`. Each time `tabsObj` is updated, its latest version will be passed to Reactime, where it is processed for displaying to the user by the *app* folder scripts.
 
-3. Likewise, when there is an action from Reactime dev tools - a jump request for example, a request will be made to the background script which is proxied to the content script. This content script will talk to the browser interface to request the *state* that the user wants to jump to. One important thing to note here is that the jump action will be excecuted in the backend script because it has direct access to the DOM.
+3. Likewise, when Reactime emits an action due to user interaction -- a "jump" request for example --  a message will be passed from Reactime via the background script to the content script. Then, the content script will pass a message to the target application containing a payload that represents the state the user wants the DOM to reflect or "jump" to.
+    - One important thing to note here is that this jump action must be dispatched in the target application (i.e. *backend* land), because only there do we have direct access to the DOM.

src/app/__tests__/Chart.test.tsx renamed to src/app/__tests__/Chart_deprecated_.test.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicxit-any */
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable react/jsx-props-no-spreading */
 /* eslint-disable import/no-extraneous-dependencies */
@@ -7,45 +7,77 @@
 import React from 'react';
 import { configure, mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
+import History from '../components/History';
 
-const Chart = require('../components/Chart').default;
 
-// Unit test cases for d3 functionality
+// Unxit test cases for d3 functionalxity
 configure({ adapter: new (Adapter as any)() });
 
-// Test the life cycle methods in Chart
-describe('Life cycle methods in Chart', () => {
+// Test the life cycle methods in History
+describe('Life cycle methods in History', () => {
   let wrapper;
   const props = {
-    hierarchy: 0,
+    hierarchy: {
+      branch: 0,
+      children : [
+        {
+          index:1,
+          name:2,
+          branch:0,
+          stateSnapshot:{},
+          children: []
+        }
+      ],
+      index : 0,
+      name : 1,
+      stateSnapshot : {
+        children:[
+          {
+          children: [],
+          componentData: {
+            actualDuration : 1.0,
+            actualStartTime : 1.0,
+            selfBaseDuration : 1.0,
+            treeBaseDuration : 1.0,
+        },
+        name: 'root',
+        state: 'stateless'
+      }
+    ],
+        componentData: {},
+        name: "root",
+        state: "root"
+      }
+    },
   };
   // Set up wrapper
   beforeEach(() => {
-    wrapper = mount(<Chart {...props} />);
+    console.log(props)
+    wrapper = mount(<History {...props} />);
   });
   // test componentDidMount
-  it('should call componentDidMount once', () => {
+  xit('should call componentDidMount once', () => {
     const instance = wrapper.instance();
     jest.spyOn(instance, 'componentDidMount');
     instance.componentDidMount();
     expect(instance.componentDidMount).toHaveBeenCalledTimes(1);
   });
-  // test maked3Tree within componentDidMount
-  it('should call maked3Tree upon mounting', () => {
+  // test maked3Tree wxithin componentDidMount
+  xit('should call maked3Tree upon mounting', () => {
     const instance = wrapper.instance();
     jest.spyOn(instance, 'maked3Tree');
     instance.componentDidMount();
     expect(instance.maked3Tree).toHaveBeenCalledTimes(1);
   });
   // test componentDidUpdate
-  it('should call componentDidUpdate once', () => {
+  xit('should call componentDidUpdate once', () => {
     const instance = wrapper.instance();
     jest.spyOn(instance, 'componentDidUpdate');
     instance.componentDidUpdate();
     expect(instance.componentDidUpdate).toHaveBeenCalledTimes(1);
   });
-  // test maked3Tree within componentDidUpdate
-  it('should call maked3Tree once upon updating', () => {
+  // test maked3Tree wxithin componentDidUpdate
+  xit('should call maked3Tree once upon updating', () => {
     const instance = wrapper.instance();
     jest.spyOn(instance, 'maked3Tree');
     instance.componentDidUpdate();
@@ -65,11 +97,11 @@ describe('Root object', () => {
   };
   // Set up wrapper
   beforeEach(() => {
-    wrapper = mount(<Chart {...props} />);
+    wrapper = mount(<History {...props} />);
   });
 
   // eslint-disable-next-line jest/no-disabled-tests
-  it('should be a deep clone of the hierarchy', () => {
+  xit('should be a deep clone of the hierarchy', () => {
     const instance = wrapper.instance();
     instance.componentDidMount();
     expect(typeof root).toBe(typeof props.hierarchy);
@@ -85,10 +117,10 @@ describe('maked3Tree method', () => {
   };
   // Set up wrapper
   beforeEach(() => {
-    wrapper = mount(<Chart {...props} />);
+    wrapper = mount(<History {...props} />);
   });
-  // Test the invocation of removed3Tree within maked3Tree
-  it('should call removed3Tree once', () => {
+  // Test the invocation of removed3Tree wxithin maked3Tree
+  xit('should call removed3Tree once', () => {
     const instance = wrapper.instance();
     jest.spyOn(instance, 'removed3Tree');
     instance.maked3Tree();

src/app/__tests__/ComponentMap.test.tsx

@@ -0,0 +1,26 @@
+/* eslint:disable */
+
+import * as d3 from 'd3'
+
+describe('D3Canvas Testing', ()=> {
+  const getCanvas = () => {
+    return d3.select('#canvas')
+  }
+
+  it ('should exist', ()=>{
+    expect(getCanvas()).not.toBeNull();
+  })
+
+})
+
+describe('D3 Node Testing', ()=> {
+  const getNodes = () => {
+    return d3.select('g')
+  }
+
+  it ('should exist', () => {
+    expect(getNodes()).not.toBeNull();
+  })
+
+
+})

src/app/__tests__/History.test.tsx

@@ -0,0 +1,26 @@
+/* eslint:disable */
+
+import * as d3 from 'd3'
+
+describe('D3 Canvas Testing', ()=> {
+  const getCanvas = () => {
+    return d3.select('#canvas')
+  }
+
+  it ('should render', ()=>{
+    expect(getCanvas()).not.toBeNull();
+  })
+
+})
+
+describe('D3 Node Testing', ()=> {
+  const getNodes = () => {
+    return d3.select('g')
+  }
+
+  it ('should render', () => {
+    expect(getNodes()).not.toBeNull();
+  })
+
+
+})