Revert "Fixed/Cleaned up feat(undoMerge/undoCommit)"

This reverts commit 5dd86e3.

Author: jpukin

components/DropDownOther.js

@@ -6,7 +6,7 @@ const { execSync, exec } = require("child_process");
 const importJsx = require("import-jsx");
 const TreeTab = importJsx('./TreeTab')
 const Stash = importJsx('./Stash')
-const CommitRevert = importJsx('./CommitRevert')
+const MergeRevert = importJsx('./MergeRevert')
 
 const popStash = require('../actions/undoStash')
 
@@ -35,8 +35,8 @@ const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
             value: 'undoStash'
         },
         {
-            label: 'Undo Commit',
-            value: 'undoCommit'
+            label: 'Undo Merge',
+            value: 'undoMerge'
         }
     ]
     switch (currentDrop) {
@@ -61,11 +61,11 @@ const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
                     <popStash refreshTab={refreshTab} />
                 </Box>
             )
-        case 'undoCommit':
+        case 'undoMerge':
             return (
                 <Box flexDirection='column' marginLeft='109'>
                     <SelectInput items={items} isFocused={false} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
-                    <CommitRevert refreshTab={refreshTab} />
+                    <MergeRevert refreshTab={refreshTab} />
                 </Box>
             )
         default:

components/DropDownOther.js~Updated upstream

@@ -0,0 +1,71 @@
+const React = require("react");
+const { useEffect, useState, useRef } = require("react");
+const { Text, Box, Newline } = require("ink");
+const SelectInput = require("ink-select-input-horizontal").default;
+const { execSync, exec } = require("child_process");
+const importJsx = require("import-jsx");
+const TreeTab = importJsx('./TreeTab')
+const Stash = importJsx('./Stash')
+const MergeRevert = importJsx('./MergeRevert')
+
+//Creates the switch case for the 'Other' Tab.
+
+const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
+    const [currentDrop, setCurrentDrop] = useState('')
+
+    const handleSelect = (item) => {
+        setCurrentDrop(item.value)
+    }
+    const items = [
+        {
+            label: 'Access Full Log Tree',
+            value: 'fullLogTree'
+        },
+        {
+            label: 'Stash Changes',
+            value: 'stashChanges'
+        },
+        {
+            label: 'Undo Stash',
+            value: 'undoStash'
+        },
+        {
+            label: 'Undo Merge',
+            value: 'undoMerge'
+        }
+    ]
+    switch (currentDrop) {
+        case 'fullLogTree':
+            return (
+                <Box flexDirection='column'>
+                    <SelectInput items={items} isFocused={false} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
+                    <TreeTab refreshTab={refreshTab} />
+                </Box>
+            )
+        case 'stashChanges':
+            return (
+                <Box flexDirection='column'>
+                    <SelectInput items={items} isFocused={false} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
+                    <Stash refreshTab={refreshTab} />
+                </Box>
+            )
+        case 'undoMerge':
+            return (
+                <Box flexDirection='column'>
+                    <SelectInput items={items} isFocused={false} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
+                    <MergeRevert refreshTab={refreshTab} />
+                </Box>
+            )
+        default:
+            return (
+                // Replace "marginLeft='109'" for optimized solution later down the line.
+                <Box flexDirection="column" marginLeft='109' >
+                    <SelectInput items={items} onSelect={handleSelect} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
+                    <Newline />
+                    <Text color='gray'>Press ESC to go back</Text>
+                </Box>
+            )//teste
+    }
+};
+
+module.exports = dropDown

components/CommitRevert.js renamed to components/MergeRevert.js

@@ -4,7 +4,7 @@ const { Box, Text, NewLine } = require('ink')
 const { execSync, exec } =require("child_process")
 const TextInput = require("ink-text-input").default;
 
-const CommitRevert = (props) => {
+const MergeRevert = (props) => {
     const [commitId, setCommitId] = useState("");
 
     let { refreshTab } = props;
@@ -43,4 +43,4 @@ const CommitRevert = (props) => {
     )
 }
 
-module.exports = CommitRevert
+module.exports = MergeRevert