Merge pull request #45 from oslabs-beta/rydang/treelabel

added name labeling to the tree, also reset lock and pause button state upon refresh

Author: joshua0308

src/app/components/Action.jsx

@@ -15,7 +15,6 @@ const Action = (props) => {
       <div
         className="jump-button"
         onClick={() => handleJumpSnapshot(index)}
-        onKeyPress={() => console.log('key pressed')}
         tabIndex={index}
         role="button"
       >

src/app/components/Tree.jsx

@@ -1,17 +1,15 @@
 import React from 'react';
 import JSONTree from 'react-json-tree';
+import PropTypes from 'prop-types';
 
 const getItemString = (type, data, itemType, itemString) => (
   <span>
-    {/* //
-    {type} */}
+    {data.name}
   </span>
 );
 
 const Tree = (props) => {
   const { snapshot } = props;
-  console.log('TREE COMPONENT IS PRINTED');
-  console.log(snapshot);
   return (
     <React.Fragment>
       {snapshot && (
@@ -20,11 +18,26 @@ const Tree = (props) => {
           theme={{ tree: () => ({ className: 'json-tree' }) }}
           shouldExpandNode={() => true}
           getItemString={getItemString}
-          // labelRenderer={raw => <strong>{raw}</strong>}
-          // valueRenderer={raw => <em>{raw}</em>}
+          labelRenderer={(raw) => {
+            if (typeof raw[0] !== 'number') return <span>{raw[0]}</span>;
+          }}
         />
       )}
     </React.Fragment>
   );
 };
+
+Tree.propTypes = {
+  snapshot: PropTypes.shape({
+    state: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.object,
+    ]),
+    children: PropTypes.arrayOf(
+      PropTypes.object,
+    ),
+    name: PropTypes.string,
+  }).isRequired,
+};
+
 export default Tree;

src/app/containers/MainContainer.jsx

@@ -39,12 +39,11 @@ class MainContainer extends Component {
       switch (action) {
         case 'sendSnapshots': {
           const snapshotIndex = payload.length - 1;
-
           // set state with the information received from the background script
           this.setState({ snapshots: payload, snapshotIndex });
           break;
         }
-        case 'initialConnectSnapshot': {
+        case 'initialConnectSnapshots': {
           const { snapshots, mode } = payload;
           const snapshotIndex = snapshots.length - 1;
           this.setState({ snapshots, snapshotIndex, mode });
@@ -69,7 +68,7 @@ class MainContainer extends Component {
     if (snapshots.length > 0 && snapshotIndex > 0) {
       const newIndex = snapshotIndex - 1;
       // second callback parameter of setState to invoke handleJumpSnapshot
-      this.setState({ snapshotIndex: newIndex }, this.handleJumpSnapshot(newIndex) );
+      this.setState({ snapshotIndex: newIndex }, this.handleJumpSnapshot(newIndex));
     }
   }
 
@@ -78,34 +77,34 @@ class MainContainer extends Component {
     this.pause();
     if (snapshotIndex < snapshots.length - 1) {
       const newIndex = snapshotIndex + 1;
-      this.setState({ snapshotIndex: newIndex }, this.handleJumpSnapshot(newIndex) );
+      this.setState({ snapshotIndex: newIndex }, this.handleJumpSnapshot(newIndex));
     }
   }
 
   play() {
-    globalPlaying = !globalPlaying
-    this.setState({playing: globalPlaying}, () => {
-      if(this.state.playing){
+    globalPlaying = !globalPlaying;
+    this.setState({ playing: globalPlaying }, () => {
+      if (this.state.playing) {
         intervalId = setInterval(() => {
           const { snapshots, snapshotIndex } = this.state;
-            if (snapshotIndex < snapshots.length - 1) {
-                const newIndex = snapshotIndex + 1;
-                this.setState({ snapshotIndex: newIndex}, this.handleJumpSnapshot(newIndex) );
-            } else {
-                // clear interval when play reaches the end
-                globalPlaying = false;
-                clearInterval(intervalId);
-                this.setState({ playing: false })
-              }
+          if (snapshotIndex < snapshots.length - 1) {
+            const newIndex = snapshotIndex + 1;
+            this.setState({ snapshotIndex: newIndex }, this.handleJumpSnapshot(newIndex));
+          } else {
+            // clear interval when play reaches the end
+            globalPlaying = false;
+            clearInterval(intervalId);
+            this.setState({ playing: false })
+          }
         }, 1000);
       } else {
         clearInterval(intervalId);
       }
-    })
+    });
   }
 
   pause() {
-    this.setState({playing: false}, clearInterval(intervalId))
+    this.setState({ playing: false }, clearInterval(intervalId));
   }
 
   emptySnapshot() {
@@ -161,7 +160,7 @@ class MainContainer extends Component {
             handleJumpSnapshot={this.handleJumpSnapshot}
             emptySnapshot={this.emptySnapshot}
           />
-          <StateContainer snapshot={snapshots[snapshotIndex]} />
+          {(snapshots.length) ? <StateContainer snapshot={snapshots[snapshotIndex]} /> : null}
           <TravelContainer
             snapshotsLength={snapshots.length}
             snapshotIndex={snapshotIndex}
@@ -170,8 +169,8 @@ class MainContainer extends Component {
             moveBackward={this.moveBackward}
             moveForward={this.moveForward}
             play={this.play}
-            playing = {playing}
-            pause = {this.pause}
+            playing={playing}
+            pause={this.pause}
           />
           <ButtonsContainer mode={mode} toggleMode={this.toggleMode} />
         </div>

src/app/containers/TravelContainer.jsx

@@ -15,7 +15,7 @@ const TravelContainer = ({
 }) => (
   <div className="travel-container">
     <div className="play-button" onClick={play}>
-      { playing ? 'Pause': 'Play' }
+      {playing ? 'Pause' : 'Play'}
     </div>
     <MainSlider
       snapshotLength={snapshotsLength}
@@ -34,13 +34,14 @@ const TravelContainer = ({
 );
 
 TravelContainer.propTypes = {
-  pause: PropTypes.func.isRequried,
+  pause: PropTypes.func.isRequired,
   play: PropTypes.func.isRequired,
   moveBackward: PropTypes.func.isRequired,
   moveForward: PropTypes.func.isRequired,
   snapshotsLength: PropTypes.number.isRequired,
   handleChangeSnapshot: PropTypes.func.isRequired,
   handleJumpSnapshot: PropTypes.func.isRequired,
   snapshotIndex: PropTypes.number.isRequired,
+  playing: PropTypes.bool.isRequired,
 };
 export default TravelContainer;

src/extension/background.js

@@ -15,7 +15,7 @@ chrome.runtime.onConnect.addListener((port) => {
   // send it to devtools as soon as connection to devtools is made
   if (snapshotArr.length > 0) {
     bg.postMessage({
-      action: 'initialConnectSnapshot',
+      action: 'initialConnectSnapshots',
       payload: {
         snapshots: snapshotArr,
         mode,
@@ -57,28 +57,34 @@ chrome.runtime.onMessage.addListener((request) => {
   switch (action) {
     case 'tabReload':
       firstSnapshot = true;
+      mode.locked = false;
+      mode.paused = false;
       if (!persist) snapshotArr = [];
       break;
     case 'recordSnap':
-      // don't do anything for the first snapshot if current mode is persist
-      if (persist && firstSnapshot) {
+      if (firstSnapshot) {
         firstSnapshot = false;
+        // don't add anything to snapshot storage if mode is persisting for the initial snapshot
+        if (!persist) snapshotArr.push(request.payload);
+        bg.postMessage({
+          action: 'initialConnectSnapshots',
+          payload: {
+            snapshots: snapshotArr,
+            mode,
+          },
+        });
         break;
       }
-      firstSnapshot = false;
       snapshotArr.push(request.payload);
-      // if port is not null, send a message to devtools
-      if (bg) {
-        // TODO:
-        // get active tab id
-        // get snapshot arr from tab object
+      // TODO:
+      // get active tab id
+      // get snapshot arr from tab object
 
-        // send message to devtools
-        bg.postMessage({
-          action: 'sendSnapshots',
-          payload: snapshotArr,
-        });
-      }
+      // send message to devtools
+      bg.postMessage({
+        action: 'sendSnapshots',
+        payload: snapshotArr,
+      });
       break;
     default:
   }

src/extension/contentScript.js

@@ -1,15 +1,12 @@
-console.log('contentScript running');
-
 // listening for messages from npm package
 window.addEventListener('message', (msg) => {
   // post initial Message to npm package
-  const { action, payload } = msg.data;
-  console.log('npm -> contentScript', msg.data);
+  const { action } = msg.data;
   if (action === 'recordSnap') chrome.runtime.sendMessage(msg.data);
 });
 
 // listening for messages from background.js
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+chrome.runtime.onMessage.addListener((request) => {
   // send the message to npm package
   const { action } = request;
   switch (action) {
@@ -29,4 +26,3 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
 chrome.runtime.sendMessage({ action: 'tabReload' });
 
 window.postMessage({ action: 'contentScriptStarted' });
-console.log('contentScriptStarted msg sent');

src/extension/devtools.js

@@ -1,3 +1,2 @@
 chrome.devtools.panels.create('React Time-Travel', null, 'panel.html', (panel) => {
-  console.log('devtools.js => panel created');
 });