Merge pull request #4 from gitopia/fix-console-errors

hTrap · web-flow · commit 231e4aac403f · 2020-12-19T15:03:26.000+05:30
Fix console errors
diff --git a/src/ui/components/argit/Layout/BranchDropdown.tsx b/src/ui/components/argit/Layout/BranchDropdown.tsx
@@ -26,18 +26,17 @@ const BranchDropdown = props => {
         {getBranchFromRef(props.currentRef)}
       </DropdownToggle>
       <DropdownMenu>
-        {props.refs.map(ref => {
-          return (
-            <DropdownItem
-              disabled={ref === props.currentRef}
-              onClick={() => {
-                props.updateCurrentRef({ currentRef: ref })
-              }}
-            >
-              {getBranchFromRef(ref)}
-            </DropdownItem>
-          )
-        })}
+        {props.refs.map(ref => (
+          <DropdownItem
+            key={ref}
+            disabled={ref === props.currentRef}
+            onClick={() => {
+              props.updateCurrentRef({ currentRef: ref })
+            }}
+          >
+            {getBranchFromRef(ref)}
+          </DropdownItem>
+        ))}
       </DropdownMenu>
     </Dropdown>
   )
diff --git a/src/ui/components/organisms/RepositoryBrowser/DirectoryLine.tsx b/src/ui/components/organisms/RepositoryBrowser/DirectoryLine.tsx
@@ -216,23 +216,27 @@ interface LinkedLinesState {
 }
 
 class LinkedLines extends React.Component<LinkedLinesProps, LinkedLinesState> {
+  _isMounted = false
   state = { fileList: [] }
 
   async componentDidMount() {
-    const {repositoryURL, repositoryHead, root, dirpath} = this.props
+    this._isMounted = true
+    const { repositoryURL, repositoryHead, root, dirpath } = this.props
+
     if (repositoryHead) {
-      await loadDirectory(
-        arweave,
-        repositoryURL,
-        repositoryHead,
-        root,
-        dirpath
-      )
+      await loadDirectory(arweave, repositoryURL, repositoryHead, root, dirpath)
       const fileList = await readFileStats(root, dirpath)
-      this.setState({ fileList })
+
+      if (this._isMounted) {
+        this.setState({ fileList })
+      }
     }
   }
 
+  componentWillUnmount() {
+    this._isMounted = false
+  }
+
   render() {
     const { dirpath, depth, root, editingFilepath } = this.props
 
diff --git a/src/ui/components/utils/StackRouter.tsx b/src/ui/components/utils/StackRouter.tsx
@@ -360,7 +360,7 @@ export const StackRouter = connector(
           {/* <DgitScore /> */}
           <Container>
             {repositoryHead && (
-              <Row alignItems="center" flexCol>
+              <Row alignitems="center" flexcol="true">
                 <Col xs="12">
                   <div className="card-dgit">
                     <CardBody>
