Merge branch 'master' into migrate

Author: ridhishjain

.github/workflows/nodejs.yml

@@ -1,7 +1,7 @@
 name: Node CI
 
 on:
-  push
+  [push, pull_request] 
 
 jobs:
   build:

README.md

@@ -73,7 +73,7 @@ The web-gui should now be available at the url http://localhost:5572
 **Bash users:**
 
 Download the sh file given here: 
-[webui.sh](https://raw.githubusercontent.com/negative0/rclone-webui-react/master/package.json)
+[webui.sh](https://raw.githubusercontent.com/rclone/rclone-webui-react/master/webui.sh)
 
 Copy the file to root folder of rclone.
 
@@ -118,7 +118,7 @@ Coming soon
 
 ### Get the Project
 ```
-    git clone https://github.com/negative0/rclone-webui-react
+    git clone https://github.com/rclone/rclone-webui-react
 ```
 OR download a zip from the option above.
 

package-lock.json

@@ -12,53 +12,53 @@
     "url": "[email protected]:negative0/rclone-webui-react.git"
   },
   "dependencies": {
-    "@coreui/coreui": "^2.1.12",
+    "@coreui/coreui": "^2.1.16",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
     "@coreui/icons": "0.3.0",
-    "@coreui/react": "~2.5.1",
-    "axios": "^0.19.0",
-    "bootstrap": "^4.3.1",
-    "chart.js": "^2.8.0",
+    "@coreui/react": "^2.5.4",
+    "axios": "^0.19.2",
+    "bootstrap": "^4.4.1",
+    "chart.js": "^2.9.3",
     "classnames": "^2.2.6",
-    "core-js": "^3.1.4",
-    "flag-icon-css": "^3.3.0",
+    "core-js": "^3.6.4",
+    "flag-icon-css": "^3.4.6",
     "font-awesome": "^4.7.0",
     "jquery": "^3.4.1",
     "lodash": "^4.17.14",
     "node-sass": "^4.13.1",
     "package.json": "^2.0.1",
     "prop-types": "^15.7.2",
-    "react": "^16.8.6",
-    "react-app-polyfill": "^1.0.1",
+    "react": "^16.12.0",
+    "react-app-polyfill": "^1.0.6",
     "react-autosuggest": "^9.4.3",
-    "react-awesome-player": "^1.0.9",
-    "react-chartjs-2": "^2.7.6",
+    "react-awesome-player": "^1.0.11",
+    "react-chartjs-2": "^2.9.0",
     "react-dnd": "^7.7.0",
     "react-dnd-html5-backend": "^7.7.0",
-    "react-dom": "^16.8.6",
+    "react-dom": "^16.12.0",
     "react-in-viewport": "0.0.38",
-    "react-redux": "^7.1.0",
-    "react-router-config": "^5.0.1",
+    "react-redux": "^7.1.3",
+    "react-router-config": "^5.1.1",
     "react-router-dom": "~5.0.1",
-    "react-test-renderer": "^16.8.6",
-    "react-toastify": "^5.2.1",
-    "reactstrap": "^8.0.0",
-    "redux": "^4.0.4",
+    "react-test-renderer": "^16.12.0",
+    "react-toastify": "^5.5.0",
+    "reactstrap": "^8.4.1",
+    "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
     "simple-line-icons": "^2.4.1",
-    "typescript": "^3.5.3"
+    "typescript": "^3.7.5"
   },
   "devDependencies": {
     "check-prop-types": "^1.1.2",
-    "coveralls": "^3.0.4",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
-    "enzyme-to-json": "^3.3.5",
-    "fetch-mock": "^7.3.6",
-    "react-dnd-test-utils": "^7.4.4",
+    "coveralls": "^3.0.9",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.2",
+    "enzyme-to-json": "^3.4.4",
+    "fetch-mock": "^7.7.3",
     "react-dnd-test-backend": "^7.7.0",
-    "react-scripts": "^3.0.1",
-    "redux-mock-store": "^1.5.3"
+    "react-dnd-test-utils": "^7.4.4",
+    "react-scripts": "^3.3.1",
+    "redux-mock-store": "^1.5.4"
   },
   "scripts": {
     "start": "react-scripts start",

package.json

@@ -1,5 +1,6 @@
 export const FETCH_STATUS = 'FETCH_STATUS';
 export const GET_PROVIDERS = 'GET_PROVIDERS';
+export const GET_VERSION = 'GET_VERSION';
 export const GET_CONFIG_FOR_REMOTE = 'GET_CONFIG_FOR_REMOTE';
 export const GET_REMOTE_LIST = 'GET_REMOTE_LIST';
 export const GET_CONFIG_DUMP = 'GET_CONFIG_DUMP';

src/actions/types.js

@@ -0,0 +1,22 @@
+import axiosInstance from '../utils/API/API';
+import urls from '../utils/API/endpoint';
+import { GET_VERSION, REQUEST_SUCCESS, REQUEST_ERROR } from './types';
+
+export const getVersion = () => {
+  return dispatch => {
+    axiosInstance.post(urls.getRcloneVersion).then(
+      res =>
+        dispatch({
+          type: GET_VERSION,
+          status: REQUEST_SUCCESS,
+          payload: res.data
+        }),
+      error =>
+        dispatch({
+          type: GET_VERSION,
+          status: REQUEST_ERROR,
+          payload: error
+        })
+    );
+  };
+};

src/actions/versionActions.js

@@ -1,6 +1,7 @@
 import React, {Component, Suspense} from 'react';
 import {Redirect, Route, Switch} from 'react-router-dom';
 import {Container} from 'reactstrap';
+import {getVersion} from "../../actions/versionActions";
 
 import {
     AppAside,
@@ -26,14 +27,34 @@ const DefaultAside = React.lazy(() => import('./DefaultAside'));
 const DefaultFooter = React.lazy(() => import('./DefaultFooter'));
 const DefaultHeader = React.lazy(() => import('./DefaultHeader'));
 
+const VERSION_NAV_ITEM_ATTRS = {
+    attributes: { target: '_blank' },
+    class: 'mt-auto',
+    icon: 'cui-cog',
+    url: 'https://rclone.org/changelog',
+    variant: 'success'
+}
 class DefaultLayout extends Component {
 
     loading = () => <div className="animated fadeIn pt-1 text-center">Loading...</div>;
 
+    get navConfig() {
+        return {
+            items: [
+                ...navigation.items,
+                {
+                    name: this.props.version.version,
+                    ...VERSION_NAV_ITEM_ATTRS
+                }
+            ]
+        }
+    }
 
     componentWillMount() {
         if (!localStorage.getItem(AUTH_KEY)) {
             this.props.history.push('/login');
+        } else {
+            this.props.getVersion();
         }
     }
 
@@ -54,7 +75,7 @@ class DefaultLayout extends Component {
                             <AppSidebarHeader/>
                             <AppSidebarForm/>
                             <Suspense fallback={this.loading()}>
-                                <AppSidebarNav navConfig={navigation} {...this.props} />
+                                <AppSidebarNav navConfig={this.navConfig} />
                             </Suspense>
                             <AppSidebarFooter/>
                             <AppSidebarMinimizer/>
@@ -102,6 +123,7 @@ class DefaultLayout extends Component {
 
 const mapStateToProps = (state) => ({
     isConnected: state.status.isConnected,
+    version: state.version,
 });
 
-export default connect(mapStateToProps, {})(DefaultLayout);
+export default connect(mapStateToProps, { getVersion })(DefaultLayout);

src/containers/DefaultLayout/DefaultLayout.js

@@ -42,26 +42,16 @@ exports[`Remote Explorer renders should match snapshot 1`] = `
         <AppSidebarForm
           tag="div"
         />
-        <Suspense>
+        <Suspense
+          fallback={
+            <div
+              className="animated fadeIn pt-1 text-center"
+            >
+              Loading...
+            </div>
+          }
+        >
           <AppSidebarNav
-            history={
-              Object {
-                "push": [MockFunction] {
-                  "calls": Array [
-                    Array [
-                      "/login",
-                    ],
-                  ],
-                  "results": Array [
-                    Object {
-                      "type": "return",
-                      "value": undefined,
-                    },
-                  ],
-                },
-              }
-            }
-            isConnected={true}
             isOpen={false}
             navConfig={
               Object {
@@ -91,18 +81,19 @@ exports[`Remote Explorer renders should match snapshot 1`] = `
                     "name": "Log Out",
                     "url": "/login",
                   },
+                  Object {
+                    "attributes": Object {
+                      "target": "_blank",
+                    },
+                    "class": "mt-auto",
+                    "icon": "cui-cog",
+                    "name": "",
+                    "url": "https://rclone.org/changelog",
+                    "variant": "success",
+                  },
                 ],
               }
             }
-            store={
-              Object {
-                "dispatch": [Function],
-                "getState": [Function],
-                "replaceReducer": [Function],
-                "subscribe": [Function],
-                Symbol(observable): [Function],
-              }
-            }
             tag="nav"
           />
         </Suspense>

src/containers/DefaultLayout/__snapshots__/DefaultLayout.test.js.snap

@@ -8,6 +8,7 @@ import {SIGNOUT_REQUEST} from "../actions/types";
 import providerStatusReducer from "./providerStatusReducer";
 import userActionsReducer from "./userActionsReducer";
 import imagesReducer from "./imagesReducer";
+import versionReducer from "./versionReducer";
 
 /**
  * Configures the root reducer to be executed before any other reducers configured in the system.
@@ -36,7 +37,8 @@ const appReducer = combineReducers({
     explorer: explorerState,
     providerStatus: providerStatusReducer,
     user: userActionsReducer,
-    imageLoader: imagesReducer
+    imageLoader: imagesReducer,
+    version: versionReducer
     // remoteOps: remoteOpsReducer
 });
 

src/reducers/index.js

@@ -0,0 +1,32 @@
+import { GET_VERSION, REQUEST_ERROR, REQUEST_SUCCESS } from '../actions/types';
+
+export const initialState = {
+  arch: '',
+  decomposed: [],
+  goVersion: '',
+  isGit: false,
+  os: '',
+  version: '',
+  hasError: false
+};
+
+export default (state = initialState, action) => {
+  if (action.type === GET_VERSION) {
+    if (action.status === REQUEST_SUCCESS) {
+      return {
+        ...state,
+        ...action.payload,
+        hasError: false
+      };
+    }
+    if (action.status === REQUEST_ERROR) {
+      return {
+        ...state,
+        error: action.payload,
+        hasError: true
+      };
+    }
+  }
+
+  return state;
+};