Merge pull request #5 from oslabs-beta/louis/new-feature

Updated code in ErrorHandler.tsx, getLinkComponent.ts, History.tsx
open-source-labs · Oct 12, 2022 · 0155bfc · 0155bfc
2 parents 5c39744 + 0b08f3b
commit 0155bfc
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 85 deletions.
diff --git a/src/app/components/ErrorHandler.tsx b/src/app/components/ErrorHandler.tsx
@@ -1,17 +1,20 @@
 import React from 'react';
 
 class ErrorHandler extends React.Component {
-  constructor(props:any) {
+  constructor(props:unknown) {
     super(props);
     this.state = { errorOccurred: false };
   }
 
-  componentDidCatch(error:string, info:string) {
+  componentDidCatch(error: string, info: string): void {
     this.setState({ errorOccurred: true });
   }
 
-  render() {
-    return this.state.errorOccurred ? <div>Unexpected Error</div> : this.props.children
+  render(): JSX.Element {
+    const { errorOccurred } = this.state;
+    // eslint-disable-next-line react/prop-types
+    const { children } = this.props;
+    return errorOccurred ? <div>Unexpected Error</div> : children;
   }
 }
 

diff --git a/src/app/components/History.tsx b/src/app/components/History.tsx
@@ -8,7 +8,14 @@ import * as d3 from 'd3';
 import { changeView, changeSlider, setCurrentTabInApp } from '../actions/actions';
 import { useStoreContext } from '../store';
 
-const defaultMargin = {
+interface defaultMargin {
+  top: number,
+  left: number,
+  right: number,
+  bottom: number,
+}
+
+const defaultMargin: defaultMargin = {
   top: 30, left: 30, right: 55, bottom: 70,
 };
 
@@ -30,16 +37,8 @@ function History(props: Record<string, unknown>): JSX.Element {
   const root = JSON.parse(JSON.stringify(hierarchy));
 
   // setting the margins for the Map to render in the tab window.
-  const innerWidth = totalWidth - margin.left - margin.right;
-  const innerHeight = totalHeight - margin.top - margin.bottom - 60;
-
-  useEffect(() => {
-    makeD3Tree();
-  }, [root, currLocation]);
-
-  useEffect(() => {
-    dispatch(setCurrentTabInApp('history'));
-  }, []);
+  const innerWidth: number = totalWidth - margin.left - margin.right;
+  const innerHeight: number = totalHeight - margin.top - margin.bottom - 60;
 
   function labelCurrentNode(d3root) {
     if (d3root.data.index === currLocation.index) {
@@ -63,6 +62,74 @@ function History(props: Record<string, unknown>): JSX.Element {
     return found;
   }
 
+  // findDiff function uses same logic as ActionContainer.tsx
+  function findDiff(index) {
+    const statelessCleanning = (obj: {
+      name?: string;
+      componentData?: object;
+      state?: string | any;
+      stateSnaphot?: object;
+      children?: any[];
+    }) => {
+      const newObj = { ...obj };
+      if (newObj.name === 'nameless') {
+        delete newObj.name;
+      }
+      if (newObj.componentData) {
+        delete newObj.componentData;
+      }
+      if (newObj.state === 'stateless') {
+        delete newObj.state;
+      }
+      if (newObj.stateSnaphot) {
+        newObj.stateSnaphot = statelessCleanning(obj.stateSnaphot);
+      }
+      if (newObj.children) {
+        newObj.children = [];
+        if (obj.children.length > 0) {
+          obj.children.forEach(
+            (element: { state?: object | string; children?: [] }) => {
+              if (
+                element.state !== 'stateless'
+                || element.children.length > 0
+              ) {
+                const clean = statelessCleanning(element);
+                newObj.children.push(clean);
+              }
+            },
+          );
+        }
+      }
+      return newObj;
+    };
+
+    function findStateChangeObj(delta, changedState = []) {
+      if (!delta.children && !delta.state) {
+        return changedState;
+      }
+      if (delta.state && delta.state[0] !== 'stateless') {
+        changedState.push(delta.state);
+      }
+      if (!delta.children) {
+        return changedState;
+      }
+      Object.keys(delta.children).forEach(child => {
+        // if (isNaN(child) === false) {
+        changedState.push(...findStateChangeObj(delta.children[child]));
+        // }
+      });
+      return changedState;
+    }
+
+    const delta = diff(statelessCleanning(snapshots[index - 1]), statelessCleanning(snapshots[index]));
+    const changedState = findStateChangeObj(delta);
+    // figured out the formatting for hover, applying diff.csss
+    const html = formatters.html.format(changedState[0]);
+    // uneeded, not returning a react component in SVG div
+    // const output = ReactHtmlParser(html);
+    return html;
+  }
+
   /**
  * @method makeD3Tree :Creates a new D3 Tree
  */
@@ -144,75 +211,14 @@ function History(props: Record<string, unknown>): JSX.Element {
     return svg.node();
   };
 
-  // findDiff function uses same logic as ActionContainer.tsx
-  function findDiff(index) {
-    const statelessCleanning = (obj: {
-      name?: string;
-      componentData?: object;
-      state?: string | any;
-      stateSnaphot?: object;
-      children?: any[];
-    }) => {
-      const newObj = { ...obj };
-      if (newObj.name === 'nameless') {
-        delete newObj.name;
-      }
-      if (newObj.componentData) {
-        delete newObj.componentData;
-      }
-      if (newObj.state === 'stateless') {
-        delete newObj.state;
-      }
-      if (newObj.stateSnaphot) {
-        newObj.stateSnaphot = statelessCleanning(obj.stateSnaphot);
-      }
-      if (newObj.children) {
-        newObj.children = [];
-        if (obj.children.length > 0) {
-          obj.children.forEach(
-            (element: { state?: object | string; children?: [] }) => {
-              if (
-                element.state !== 'stateless'
-                || element.children.length > 0
-              ) {
-                const clean = statelessCleanning(element);
-                newObj.children.push(clean);
-              }
-            },
-          );
-        }
-      }
-      return newObj;
-    };
-
-    function findStateChangeObj(delta, changedState = []) {
-      if (!delta.children && !delta.state) {
-        return changedState;
-      }
-      if (delta.state && delta.state[0] !== 'stateless') {
-        changedState.push(delta.state);
-      }
-      if (!delta.children) {
-        return changedState;
-      }
-      Object.keys(delta.children).forEach(child => {
-      // if (isNaN(child) === false) {
-        changedState.push(...findStateChangeObj(delta.children[child]));
-      // }
-      });
-      return changedState;
-    }
-
-    const delta = diff(statelessCleanning(snapshots[index - 1]), statelessCleanning(snapshots[index]));
-    const changedState = findStateChangeObj(delta);
-    // figured out the formatting for hover, applying diff.csss
-    const html = formatters.html.format(changedState[0]);
-    // uneeded, not returning a react component in SVG div
-    // const output = ReactHtmlParser(html);
-    return html;
-  }
+  useEffect(() => {
+    makeD3Tree();
+  }, [root, currLocation]);
 
-// then rendering each node in History tab to render using D3, which will share area with LegendKey
+  useEffect(() => {
+    dispatch(setCurrentTabInApp('history'));
+  }, []);
+  // then rendering each node in History tab to render using D3, which will share area with LegendKey
   return (
     <div className="display">
       <svg

diff --git a/src/app/components/getLinkComponent.ts b/src/app/components/getLinkComponent.ts
@@ -21,8 +21,8 @@ export default function getLinkComponent({
   layout: string;
   linkType: string;
   orientation: string;
-}): React.ComponentType<any> {
-  let LinkComponent: React.ComponentType<any>;
+}): React.ComponentType<unknown> {
+  let LinkComponent: React.ComponentType<unknown>;
 
   if (layout === 'polar') {
     if (linkType === 'step') {