diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderDetails.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderDetails.jsx
index ceb152b22b7..a0993db1157 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderDetails.jsx	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderDetails.jsx	
@@ -31,8 +31,8 @@ const FolderDetails = ({folder, handlers, validationErrors}) => (
         <div className="separator"></div>
         <div>
             <Permissions
-             folderBeingEdited={folder}
-             updateFolderBeingEdited={(permissions) => handlers.changePermissions(permissions)}
+                folderBeingEdited={folder}
+                updateFolderBeingEdited={(permissions) => handlers.changePermissions(permissions)}
             ></Permissions>
         </div>
         <div className="separator"></div>
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/Permissions.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/Permissions.jsx
index eaa5ec0ac36..1d34801acb9 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/Permissions.jsx	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/Permissions.jsx	
@@ -6,52 +6,52 @@ import { PermissionGrid } from "@dnnsoftware/dnn-react-common";
 import DnnSf from "../globals/dnnSf";
 
 class Permissions extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      permissions: JSON.parse(
-        JSON.stringify(props.folderBeingEdited.permissions)
-      ),
-    };
-  }
-
-  onPermissionsChanged(permissions) {
-    const { state } = this;
-
-    let newPermissions = Object.assign({}, state.permissions, permissions);
-    this.props.updateFolderBeingEdited(newPermissions);
-    this.setState({ permissions: newPermissions });
-  }
-
-  render() {
-    const { props, state } = this;
-    const dnnSf = new DnnSf();
-    const grid = (
-      <PermissionGrid
-        dispatch={(e) => {}}
-        permissions={state.permissions}
-        service={dnnSf}
-        onPermissionsChanged={this.onPermissionsChanged.bind(this)}
-      />
-    );
-    return <div>{grid}</div>;
-  }
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            permissions: JSON.parse(
+                JSON.stringify(props.folderBeingEdited.permissions)
+            ),
+        };
+    }
+
+    onPermissionsChanged(permissions) {
+        const { state } = this;
+
+        let newPermissions = Object.assign({}, state.permissions, permissions);
+        this.props.updateFolderBeingEdited(newPermissions);
+        this.setState({ permissions: newPermissions });
+    }
+
+    render() {
+        const { state } = this;
+        const dnnSf = new DnnSf();
+        const grid = (
+            <PermissionGrid
+                dispatch={()=>{}}
+                permissions={state.permissions}
+                service={dnnSf}
+                onPermissionsChanged={this.onPermissionsChanged.bind(this)}
+            />
+        );
+        return <div>{grid}</div>;
+    }
 }
 
 Permissions.propTypes = {
-  updateFolderBeingEdited: PropTypes.func,
-  folderBeingEdited: PropTypes.object,
+    updateFolderBeingEdited: PropTypes.func,
+    folderBeingEdited: PropTypes.object,
 };
 
-function mapStateToProps(state) {
-  return {};
+function mapStateToProps() {
+    return {};
 }
 
 function mapDispatchToProps(dispatch) {
-  return {
-    ...bindActionCreators({}, dispatch),
-  };
+    return {
+        ...bindActionCreators({}, dispatch),
+    };
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(Permissions);
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/AssetsPanelContainer.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/AssetsPanelContainer.jsx
index 18e258485db..4ef6ff85984 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/AssetsPanelContainer.jsx	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/AssetsPanelContainer.jsx	
@@ -13,176 +13,176 @@ import localizeService from "../services/localizeService.js";
 import ReactCSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
 
 class AssetsPanelContainer extends React.Component {
-  constructor(props) {
-    super(props);
-    this.mainContainer = React.createRef();
-  }
-  componentWillMount() {
-    window.addEventListener("scroll", this.handleScroll.bind(this));
-  }
-
-  getDetailsPosition(i) {
-    const itemWidth = this.props.itemWidth;
-    const container = this.mainContainer;
-    const containerWidth = container.clientWidth;
-    const itemsPerRow = Math.floor(containerWidth / itemWidth);
-    let position = Math.floor(i / itemsPerRow) * itemsPerRow + itemsPerRow - 1;
-
-    return position;
-  }
-
-  getDetailsPanel(showPanel, i) {
-    return (
-      <ReactCSSTransitionGroup
-        key={"item-details-" + i}
-        transitionName="dnn-slide-in-out"
-        transitionEnterTimeout={500}
-        transitionLeaveTimeout={300}
-        transitionLeave={!showPanel}
-      >
-        {showPanel && <ItemDetailsContainer />}
-      </ReactCSSTransitionGroup>
-    );
-  }
-
-  handleScroll() {
-    const { folderPanelState, loadContent, searchFiles } = this.props;
-    const { totalCount, loadedItems, search, loading } = folderPanelState;
-
-    const bodyHeight = document.body.offsetHeight;
-    const windowHeight = window.innerHeight;
-    const totalScrolled = window.pageYOffset;
-    const scrollMax = bodyHeight - windowHeight;
-
-    if (loadedItems < totalCount && totalScrolled + 100 > scrollMax) {
-      if (!loading) {
-        this.setState({
-          loadingFlag: true,
-        });
-
-        if (search) {
-          searchFiles(folderPanelState, search, true);
-        } else {
-          loadContent(folderPanelState);
+    constructor(props) {
+        super(props);
+        this.mainContainer = React.createRef();
+    }
+    componentWillMount() {
+        window.addEventListener("scroll", this.handleScroll.bind(this));
+    }
+
+    getDetailsPosition(i) {
+        const itemWidth = this.props.itemWidth;
+        const container = this.mainContainer;
+        const containerWidth = container.clientWidth;
+        const itemsPerRow = Math.floor(containerWidth / itemWidth);
+        let position = Math.floor(i / itemsPerRow) * itemsPerRow + itemsPerRow - 1;
+
+        return position;
+    }
+
+    getDetailsPanel(showPanel, i) {
+        return (
+            <ReactCSSTransitionGroup
+                key={"item-details-" + i}
+                transitionName="dnn-slide-in-out"
+                transitionEnterTimeout={500}
+                transitionLeaveTimeout={300}
+                transitionLeave={!showPanel}
+            >
+                {showPanel && <ItemDetailsContainer />}
+            </ReactCSSTransitionGroup>
+        );
+    }
+
+    handleScroll() {
+        const { folderPanelState, loadContent, searchFiles } = this.props;
+        const { totalCount, loadedItems, search, loading } = folderPanelState;
+
+        const bodyHeight = document.body.offsetHeight;
+        const windowHeight = window.innerHeight;
+        const totalScrolled = window.pageYOffset;
+        const scrollMax = bodyHeight - windowHeight;
+
+        if (loadedItems < totalCount && totalScrolled + 100 > scrollMax) {
+            if (!loading) {
+                this.setState({
+                    loadingFlag: true,
+                });
+
+                if (search) {
+                    searchFiles(folderPanelState, search, true);
+                } else {
+                    loadContent(folderPanelState);
+                }
+            }
         }
-      }
     }
-  }
-
-  render() {
-    const {
-      items,
-      itemEditing,
-      search,
-      itemContainerDisabled,
-      loading,
-    } = this.props;
-    let propsPosition = -1;
-
-    let result = [];
-    for (let i = 0; i < items.length; i++) {
-      const item = items[i];
-      const { itemId, itemName, isFolder } = item;
-      result.push(<Item key={itemId + itemName} item={item} />);
-
-      if (
-        itemEditing &&
+
+    render() {
+        const {
+            items,
+            itemEditing,
+            search,
+            itemContainerDisabled,
+            loading,
+        } = this.props;
+        let propsPosition = -1;
+
+        let result = [];
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            const { itemId, itemName, isFolder } = item;
+            result.push(<Item key={itemId + itemName} item={item} />);
+
+            if (
+                itemEditing &&
         ((isFolder && itemEditing.folderId === itemId) ||
           (!isFolder && itemEditing.fileId === itemId))
-      ) {
-        propsPosition = this.getDetailsPosition(i);
-      }
+            ) {
+                propsPosition = this.getDetailsPosition(i);
+            }
 
-      let showPanel =
+            let showPanel =
         i === propsPosition ||
         (propsPosition >= items.length && i === items.length - 1);
-      result.push(this.getDetailsPanel(showPanel, i));
-    }
+            result.push(this.getDetailsPanel(showPanel, i));
+        }
 
-    return (
-      <div id="Assets-panel" onClick={(e) => e.stopPropagation()}>
-        <AssetsHeader />
-        <div className="assets-body">
-          <TopBarContainer />
-          <div
-            ref={(c) => (this.mainContainer = c)}
-            className={"main-container" + (loading ? " loading" : "")}
-          >
-            <AddFolderPanelContainer />
-            <AddAssetPanelContainer />
-            <div
-              className={
-                "item-container" +
+        return (
+            <div id="Assets-panel" onClick={(e) => e.stopPropagation()}>
+                <AssetsHeader />
+                <div className="assets-body">
+                    <TopBarContainer />
+                    <div
+                        ref={(c) => (this.mainContainer = c)}
+                        className={"main-container" + (loading ? " loading" : "")}
+                    >
+                        <AddFolderPanelContainer />
+                        <AddAssetPanelContainer />
+                        <div
+                            className={
+                                "item-container" +
                 (search ? " rm_search" : "") +
                 (!items.length ? " empty" : "") +
                 (itemContainerDisabled ? " disabled" : "")
-              }
-            >
-              {result}
-              <div className="empty-label rm_search">
-                <span className="empty-title">
-                  {localizeService.getString("AssetsPanelNoSearchResults")}
-                </span>
-              </div>
-              <div className="empty-label rm-folder">
-                <span className="empty-title">
-                  {localizeService.getString("AssetsPanelEmpty_Title")}
-                </span>
-                <span className="empty-subtitle">
-                  {localizeService.getString("AssetsPanelEmpty_Subtitle")}
-                </span>
-              </div>
+                            }
+                        >
+                            {result}
+                            <div className="empty-label rm_search">
+                                <span className="empty-title">
+                                    {localizeService.getString("AssetsPanelNoSearchResults")}
+                                </span>
+                            </div>
+                            <div className="empty-label rm-folder">
+                                <span className="empty-title">
+                                    {localizeService.getString("AssetsPanelEmpty_Title")}
+                                </span>
+                                <span className="empty-subtitle">
+                                    {localizeService.getString("AssetsPanelEmpty_Subtitle")}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
+        );
+    }
 }
 
 AssetsPanelContainer.propTypes = {
-  folderPanelState: PropTypes.object,
-  items: PropTypes.array,
-  search: PropTypes.string,
-  itemContainerDisabled: PropTypes.bool,
-  loading: PropTypes.bool,
-  itemEditing: PropTypes.object,
-  itemWidth: PropTypes.number,
-  loadContent: PropTypes.func,
-  searchFiles: PropTypes.func,
+    folderPanelState: PropTypes.object,
+    items: PropTypes.array,
+    search: PropTypes.string,
+    itemContainerDisabled: PropTypes.bool,
+    loading: PropTypes.bool,
+    itemEditing: PropTypes.object,
+    itemWidth: PropTypes.number,
+    loadContent: PropTypes.func,
+    searchFiles: PropTypes.func,
 };
 
 function mapDispatchToProps(dispatch) {
-  return {
-    ...bindActionCreators(
-      {
-        loadContent: folderPanelActions.loadContent,
-        searchFiles: folderPanelActions.searchFiles,
-      },
-      dispatch
-    ),
-  };
+    return {
+        ...bindActionCreators(
+            {
+                loadContent: folderPanelActions.loadContent,
+                searchFiles: folderPanelActions.searchFiles,
+            },
+            dispatch
+        ),
+    };
 }
 
 function mapStateToProps(state) {
-  const folderPanelState = state.folderPanel;
-  const addFolderPanelState = state.addFolderPanel;
-  const addAssetPanelState = state.addAssetPanel;
-  const itemDetailsState = state.itemDetails;
-
-  return {
-    folderPanelState,
-    items: folderPanelState.items || [],
-    search: folderPanelState.search,
-    itemContainerDisabled:
+    const folderPanelState = state.folderPanel;
+    const addFolderPanelState = state.addFolderPanel;
+    const addAssetPanelState = state.addAssetPanel;
+    const itemDetailsState = state.itemDetails;
+
+    return {
+        folderPanelState,
+        items: folderPanelState.items || [],
+        search: folderPanelState.search,
+        itemContainerDisabled:
       addFolderPanelState.expanded || addAssetPanelState.expanded,
-    loading: folderPanelState.loading,
-    itemEditing: itemDetailsState.itemEditing,
-    itemWidth: folderPanelState.itemWidth,
-  };
+        loading: folderPanelState.loading,
+        itemEditing: itemDetailsState.itemEditing,
+        itemWidth: folderPanelState.itemWidth,
+    };
 }
 
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(AssetsPanelContainer);
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/DropZoneContainer.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/DropZoneContainer.jsx
index e8f3c140ea1..043151329c6 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/DropZoneContainer.jsx	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/containers/DropZoneContainer.jsx	
@@ -71,7 +71,7 @@ class DropZoneContainer extends React.Component {
                 className={className}
                 onDrop={this.uploadFilesHandler.bind(this)}
             >
-                {({ getRootProps, getInputProps }) => this.props.children}
+                {() => this.props.children}
             </DropZone>
         ) : (
             <div>{this.props.children}</div>
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/globals/dnnSf.js b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/globals/dnnSf.js
index b360874f5c9..5ef8f918664 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/globals/dnnSf.js	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/globals/dnnSf.js	
@@ -5,31 +5,31 @@ export default class DnnSf {
     tabId = -1;
     antiForgeryToken = "";
     
-    constructor(){
+    constructor() {
         this.siteRoot = window.top.dnn.getVar("sf_siteRoot", "/");
         this.tabId = parseInt(window.top.dnn.getVar("sf_tabId", "-1"));
         this.antiForgeryToken = window.top.document.querySelector("input[name=__RequestVerificationToken]").value;
     }
 
     get = (method, params, success, failure, loading, beforeSend) => {
-        return this.call('GET', method, params, success, failure, loading, beforeSend, false, false);
+        return this.call("GET", method, params, success, failure, loading, beforeSend, false, false);
     }
 
     call = (httpMethod, method, params, success, failure, loading, beforeSend, sync, silence, postFile) => {
-        let url = this.getServiceRoot() + this.controller + '/' + method;
-        this.moduleRoot = 'personaBar';
-        this.controller = '';
+        let url = this.getServiceRoot() + this.controller + "/" + method;
+        this.moduleRoot = "personaBar";
+        this.controller = "";
 
         return this.rawCall(httpMethod, url, params, success, failure, loading, beforeSend, sync, silence, postFile);
     }
 
     getServiceRoot = () => {
-        return this.siteRoot + 'API/' + this.moduleRoot + '/';
+        return this.siteRoot + "API/" + this.moduleRoot + "/";
     }
 
     rawCall = (httpMethod, url, params, success, failure, loading, beforeSend, sync, silence, postFile) => {
         let beforeCallback;
-        if (typeof beforeSend === 'function'){
+        if (typeof beforeSend === "function") {
             beforeCallback = (xhr) => {
                 this.setHeaders(xhr);
                 return beforeSend(xhr);
@@ -45,31 +45,31 @@ export default class DnnSf {
             type: httpMethod,
             async: sync === false,
             success: function (d) {
-                if (typeof loading === 'function') {
+                if (typeof loading === "function") {
                     loading(false);
                 }
 
-                if (typeof success === 'function') {
+                if (typeof success === "function") {
                     success(d || {});
                 }
             },
             error: function (xhr, status, err) {
-                if (typeof loading === 'function') {
+                if (typeof loading === "function") {
                     loading(false);
                 }
 
-                if (typeof failure === 'function') {
+                if (typeof failure === "function") {
                     if (xhr) {
                         failure(xhr, err);
                     }
                     else {
-                        failure(null, 'Unknown error');
+                        failure(null, "Unknown error");
                     }
                 }
             }
         };
 
-        if (httpMethod === 'GET') {
+        if (httpMethod === "GET") {
             options.data = params;
         } else if (postFile) {
             options.processData = false;
@@ -77,12 +77,12 @@ export default class DnnSf {
             options.data = params;
         }
         else {
-            options.contentType = 'application/json; charset=UTF-8';
+            options.contentType = "application/json; charset=UTF-8";
             options.data = JSON.stringify(params);
-            options.dataType = 'json';
+            options.dataType = "json";
         }
 
-        if (typeof loading === 'function') {
+        if (typeof loading === "function") {
             loading(true);
         }
 
@@ -91,11 +91,11 @@ export default class DnnSf {
 
     setHeaders = (xhr) => {
         if (this.tabId) {
-            xhr.setRequestHeader('TabId', this.tabId);
+            xhr.setRequestHeader("TabId", this.tabId);
         }
 
         if (this.antiForgeryToken.length > 0) {
-             xhr.setRequestHeader("RequestVerificaitonToken", this.antiForgeryToken);
+            xhr.setRequestHeader("RequestVerificaitonToken", this.antiForgeryToken);
         }
     }
 }
\ No newline at end of file
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/webpack.config.js b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/webpack.config.js
index 0ad0dd1793a..daa40408e81 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/webpack.config.js	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/webpack.config.js	
@@ -38,7 +38,10 @@ module.exports = {
                 test: /\.(js|jsx)$/,
                 exclude: /node_modules/,
                 enforce: "pre",
-                use: ["eslint-loader"]
+                loader: "eslint-loader",
+                options: {
+                    fix: true
+                }
             },
             {
                 test: /\.less$/,