uploadfile: action button should take up 100% height.

tests: Fix failing tests update snapshots update snapshots
rclone · Jul 19, 2020 · 0238025 · 0238025
1 parent fab2f28
commit 0238025
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 110 deletions.
diff --git a/src/views/Base/FileOperations/FileUploadModal.js b/src/views/Base/FileOperations/FileUploadModal.js
@@ -95,7 +95,7 @@ const FileUploadModal = (props) => {
     return (
         <div data-test="fileUploadModalComponent">
 
-            <Button className="btn-explorer-action" id="UploadButton"
+            <Button className="btn-explorer-action h-100" id="UploadButton"
                     onClick={toggle}>
                 <i className="fa fa-lg fa-upload"/>
             </Button>

diff --git a/src/views/Base/FileOperations/__snapshots__/FileOperations.test.js.snap b/src/views/Base/FileOperations/__snapshots__/FileOperations.test.js.snap
@@ -1,33 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`File Operations renders should match snapshot 1`] = `
-<Row
-  className="mt-3 mb-1"
-  tag="div"
-  widths={
-    Array [
-      "xs",
-      "sm",
-      "md",
-      "lg",
-      "xl",
-    ]
-  }
->
-  <Col
-    className="pl-0"
-    lg={2}
-    md={3}
-    sm={4}
-    tag="div"
-    widths={
-      Array [
-        "xs",
-        "sm",
-        "md",
-        "lg",
-        "xl",
-      ]
+<div
+  className="pl-0 mt-3 mb-1 d-flex justify-content-between align-items-center"
+  style={
+    Object {
+      "marginLeft": "-15px",
+      "marginRight": "-15px",
     }
   }
 >
@@ -152,10 +131,17 @@ exports[`File Operations renders should match snapshot 1`] = `
         flip={true}
         tag="div"
       >
-        <Button
-          className="mr-1 btn-explorer-action p-1"
-          color="secondary"
-          id="CreateFolderButton"
+        <DropdownItem
+          key="None"
+          onClick={[Function]}
+          tag="button"
+          toggle={true}
+          value=""
+        >
+          None
+        </DropdownItem>
+        <DropdownItem
+          key="Images"
           onClick={[Function]}
           tag="button"
           toggle={true}
@@ -217,6 +203,16 @@ exports[`File Operations renders should match snapshot 1`] = `
     >
       Show Remote Info
     </UncontrolledTooltip>
+    <FileUploadModal
+      buttonClass="btn-explorer-action"
+      buttonLabel="Upload"
+      currentPath={
+        Object {
+          "remoteName": "local",
+          "remotePath": "",
+        }
+      }
+    />
     <Form
       inline={true}
       tag="form"
@@ -234,55 +230,20 @@ exports[`File Operations renders should match snapshot 1`] = `
             className="fa fa-lg fa-search"
           />
         </Button>
-        <UncontrolledTooltip
-          placement="right"
-          target="InfoButton"
-        >
-          Show Remote Info
-        </UncontrolledTooltip>
-        <FileUploadModal
-          buttonClass="btn-explorer-action"
-          buttonLabel="Upload"
-          currentPath={
-            Object {
-              "remoteName": "local",
-              "remotePath": "",
-            }
-          }
-        />
-        <Form
-          inline={true}
-          tag="form"
-        >
-          <FormGroup
-            tag="div"
-          >
-            <Button
-              className="mr-1 btn-explorer-action"
-              color=""
-              onClick={[Function]}
-              tag="button"
-            >
-              <i
-                className="fa fa-lg fa-search"
-              />
-            </Button>
-          </FormGroup>
-        </Form>
-      </ButtonGroup>
-      <Connect(NewFolder)
-        closeModal={[Function]}
-        containerID="0"
-        isVisible={false}
-      />
-      <Modal
-        autoFocus={true}
-        backdrop={true}
-        backdropTransition={
-          Object {
-            "mountOnEnter": true,
-            "timeout": 150,
-          }
+      </FormGroup>
+    </Form>
+    <Connect(NewFolder)
+      closeModal={[Function]}
+      containerID="0"
+      isVisible={false}
+    />
+    <Modal
+      autoFocus={true}
+      backdrop={true}
+      backdropTransition={
+        Object {
+          "mountOnEnter": true,
+          "timeout": 150,
         }
       }
       centered={false}
@@ -388,24 +349,18 @@ exports[`File Operations renders should match snapshot 1`] = `
               onClick={[Function]}
               tag="button"
             >
-              <Button
-                color="danger"
-                onClick={[Function]}
-                tag="button"
-              >
-                Clean Trash 
-                <i
-                  className="fa fa-lg fa-trash"
-                />
-              </Button>
-            </Col>
-          </Row>
-        </ModalBody>
-        <ModalFooter
-          tag="div"
-        />
-      </Modal>
-    </div>
-  </Col>
-</Row>
+              Clean Trash 
+              <i
+                className="fa fa-lg fa-trash"
+              />
+            </Button>
+          </Col>
+        </Row>
+      </ModalBody>
+      <ModalFooter
+        tag="div"
+      />
+    </Modal>
+  </div>
+</div>
 `;
diff --git a/src/views/Base/FileOperations/__snapshots__/FileUploadModal.test.js.snap b/src/views/Base/FileOperations/__snapshots__/FileUploadModal.test.js.snap
@@ -5,7 +5,7 @@ exports[`File upload Modal renders should match snapshot 1`] = `
   data-test="fileUploadModalComponent"
 >
   <Button
-    className="btn-explorer-action"
+    className="btn-explorer-action h-100"
     color="secondary"
     id="UploadButton"
     onClick={[Function]}
@@ -31,6 +31,7 @@ exports[`File upload Modal renders should match snapshot 1`] = `
       }
     }
     centered={false}
+    container="body"
     fade={true}
     isOpen={false}
     keyboard={true}

diff --git a/src/views/Explorer/FilesView/FileComponent.js b/src/views/Explorer/FilesView/FileComponent.js
@@ -162,8 +162,8 @@ class FileComponent extends React.Component {
                         </td>
                         <td>{Size === -1 ? "-" : formatBytes(Size, 2)}</td>
                         <td className="d-none d-md-table-cell">{modTime.toLocaleDateString()}</td>
-                        <td><Actions downloadHandle={downloadHandle} linkShareHandle={linkShareHandle}
-                                     deleteHandle={deleteHandle} item={item}/></td>
+                        <td><FileActions downloadHandle={downloadHandle} linkShareHandle={linkShareHandle}
+                                         deleteHandle={deleteHandle} item={item}/></td>
                     </tr>
                 )
             } else {

diff --git a/src/views/Explorer/FilesView/FilesView.test.js b/src/views/Explorer/FilesView/FilesView.test.js
@@ -15,7 +15,7 @@ const setUp = (intialState = {}, props = {}) => {
 };
 
 
-describe(__filename, function () {
+describe("Files View", function () {
     describe('renders', function () {
         let wrapper;
         beforeEach(() => {

diff --git a/src/views/Explorer/FilesView/__snapshots__/FilesView.test.js.snap b/src/views/Explorer/FilesView/__snapshots__/FilesView.test.js.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`/media/negativezero/Projects/rclone/rclone-webui-react/src/views/Explorer/FilesView/FilesView.test.js renders should match snapshot 1`] = `""`;
+exports[`Files View renders should match snapshot 1`] = `""`;
diff --git a/src/views/Explorer/RemoteExplorerLayout/RemoteExplorerLayout.js b/src/views/Explorer/RemoteExplorerLayout/RemoteExplorerLayout.js
@@ -12,7 +12,6 @@ import doublePaneImg from '../../../assets/img/double-pane1.png';
 import triplePaneImg from '../../../assets/img/triple-pane.png';
 import TabbedPanes from "./TabbedPanes";
 
-import TabsLayout from "../TabsLayout/TabsLayout";
 import {DndProvider} from "react-dnd";
 import {HTML5Backend} from 'react-dnd-html5-backend';
 
@@ -117,7 +116,8 @@ RemoteExplorerLayout.propTypes = {
 	backStacks: PropTypes.object.isRequired,
 	createPath: PropTypes.func.isRequired,
 	changeNumCols: PropTypes.func.isRequired,
-	distractionFreeMode: PropTypes.bool.isRequired
+	distractionFreeMode: PropTypes.bool.isRequired,
+	activeRemoteContainerID: PropTypes.object.isRequired
 };
 
 export default connect(mapStateToProps, {

diff --git a/src/views/Explorer/RemoteExplorerLayout/RemoteExplorerLayout.test.js b/src/views/Explorer/RemoteExplorerLayout/RemoteExplorerLayout.test.js
@@ -31,7 +31,8 @@ describe('Remote Explorer Layout', function () {
             const initialState = {};
 
             const props = {
-                createPath: jest.fn()
+                createPath: jest.fn(),
+                activeRemoteContainerID: {0: "P14", 1: "38K", 2: "XXN"},
             };
             wrapper = setUp(initialState, props)
         });

diff --git a/src/views/Explorer/RemoteExplorerLayout/TabbedPanes.test.js b/src/views/Explorer/RemoteExplorerLayout/TabbedPanes.test.js
@@ -14,7 +14,6 @@ const setUp = (initialState = {}, props = {}) => {
 
 describe('Tabbed Panes', function () {
 
-
     describe('renders', function () {
         let wrapper;
         beforeEach(() => {