Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors

products/ASC.Files/Client/src/components/SimpleFileInput/index.js

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 
 import IconButton from "@appserver/components/icon-button";
 import TextInput from "@appserver/components/text-input";
-import StyledFileInput from "./styledSimpleFileInput";
+import StyledFileInput from "./StyledSimpleFileInput";
 
 let iconSize;
 const SimpleFileInput = ({

products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js

@@ -6,7 +6,7 @@ import {
 } from "../StyledPanels";
 import Text from "@appserver/components/text";
 import SelectFolderInput from "../SelectFolderInput";
-import FilesListBody from "./filesListBody";
+import FilesListBody from "./FilesListBody";
 import Aside from "@appserver/components/aside";
 import Heading from "@appserver/components/heading";
 import Backdrop from "@appserver/components/backdrop";

products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListBody.js

@@ -7,7 +7,7 @@ import InfiniteLoader from "react-window-infinite-loader";
 import AutoSizer from "react-virtualized-auto-sizer";
 import { FixedSizeList as List } from "react-window";
 import { inject, observer } from "mobx-react";
-import ListRow from "./listRow";
+import FilesListRow from "./FilesListRow";
 import EmptyContainer from "../../EmptyContainer/EmptyContainer";
 import i18n from "./i18n";
 
@@ -96,7 +96,7 @@ const FilesListBody = ({
 
       return (
         <div style={style}>
-          <ListRow
+          <FilesListRow
             displayType={displayType}
             needRowSelection={needRowSelection}
             index={index}
@@ -109,7 +109,7 @@ const FilesListBody = ({
             <Text data-index={index} className="files-list_file-owner">
               {fileOwner}
             </Text>
-          </ListRow>
+          </FilesListRow>
         </div>
       );
     },

products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js

@@ -5,7 +5,7 @@ import { inject, observer } from "mobx-react";
 import Text from "@appserver/components/text";
 import Checkbox from "@appserver/components/checkbox";
 import RadioButton from "@appserver/components/radio-button";
-const ListRow = ({
+const FilesListRow = ({
   displayType,
   needRowSelection,
   index,
@@ -28,7 +28,7 @@ const ListRow = ({
         className="modal-dialog_file-name"
         onClick={onSelectFile}
       >
-        {false ? ( // this will be "isMultiSelect" param
+        {isMultiSelect ? ( //  it will be needed
           <Checkbox
             label=""
             isChecked={isChecked}
@@ -62,8 +62,9 @@ const ListRow = ({
   );
 };
 
-ListRow.defaultProps = {
+FilesListRow.defaultProps = {
   needRowSelection: true,
+  isMultiSelect: false,
 };
 
 export default inject(({ formatsStore }, { fileExst }) => {
@@ -72,4 +73,4 @@ export default inject(({ formatsStore }, { fileExst }) => {
   return {
     iconSrc,
   };
-})(observer(ListRow));
+})(observer(FilesListRow));

products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js

@@ -6,7 +6,7 @@ import { StyledAsidePanel, StyledSelectFilePanel } from "../StyledPanels";
 import ModalDialog from "@appserver/components/modal-dialog";
 import SelectFolderDialog from "../SelectFolderDialog";
 import FolderTreeBody from "../../FolderTreeBody";
-import FilesListBody from "./filesListBody";
+import FilesListBody from "./FilesListBody";
 import Button from "@appserver/components/button";
 import Loader from "@appserver/components/loader";
 import Text from "@appserver/components/text";

products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js

@@ -7,8 +7,8 @@ import throttle from "lodash/throttle";
 
 import stores from "../../../store/index";
 import i18n from "./i18n";
-import SelectFileDialogModalView from "./modalView";
-import SelectFileDialogAsideView from "./asideView";
+import SelectFileDialogModalView from "./ModalView";
+import SelectFileDialogAsideView from "./AsideView";
 
 import utils from "@appserver/components/utils";
 import SelectFolderDialog from "../SelectFolderDialog";
@@ -75,7 +75,7 @@ class SelectFileDialogBody extends React.Component {
 
   setFilter = () => {
     const { filterParams } = this.state;
-    const { withSubfolders } = this.props;
+    const { withSubfolders = true } = this.props;
 
     this.newFilter.filterType = filterParams.filterType;
     this.newFilter.search = filterParams.filterValue;

products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js

@@ -4,13 +4,13 @@ import PropTypes from "prop-types";
 
 import stores from "../../../store/index";
 import SelectFileDialog from "../SelectFileDialog";
-import StyledComponent from "./styledSelectFileInput";
+import StyledComponent from "./StyledSelectFileInput";
 import SimpleFileInput from "../../SimpleFileInput";
 
-class SelectFile extends React.PureComponent {
+class SelectFileInputBody extends React.PureComponent {
   constructor(props) {
     super(props);
-    this.inputRef = React.createRef();
+
     this.state = {
       fileName: "",
     };
@@ -85,24 +85,24 @@ class SelectFile extends React.PureComponent {
   }
 }
 
-SelectFile.propTypes = {
+SelectFileInputBody.propTypes = {
   onClickInput: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
 };
 
-SelectFile.defaultProps = {
+SelectFileInputBody.defaultProps = {
   withoutProvider: false,
   isDisabled: false,
 };
 
-class SelectFileModal extends React.Component {
+class SelectFileInput extends React.Component {
   render() {
     return (
       <MobxProvider {...stores}>
-        <SelectFile {...this.props} />
+        <SelectFileInputBody {...this.props} />
       </MobxProvider>
     );
   }
 }
 
-export default SelectFileModal;
+export default SelectFileInput;

products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js

@@ -12,10 +12,10 @@ import {
   getFolderPath,
 } from "@appserver/common/api/files";
 
-import SelectFolderModal from "../SelectFolderInput";
+import SelectFolderInput from "../SelectFolderInput";
 import i18n from "./i18n";
-import SelectFolderDialogAsideView from "./asideView";
-import SelectFolderDialogModalView from "./modalView";
+import SelectFolderDialogAsideView from "./AsideView";
+import SelectFolderDialogModalView from "./ModalView";
 import stores from "../../../store/index";
 import utils from "@appserver/components/utils";
 
@@ -265,7 +265,7 @@ class SelectFolderModalDialog extends React.Component {
 
   setDisplayType = () => {
     const displayType = this.getDisplayType();
-    console.log("set");
+
     this.setState({ displayType: displayType });
   };
 
@@ -279,7 +279,7 @@ class SelectFolderModalDialog extends React.Component {
     getFolderPath(folder)
       .then(
         (foldersArray) =>
-          (pathName = SelectFolderModal.setFullFolderPath(foldersArray))
+          (pathName = SelectFolderInput.setFullFolderPath(foldersArray))
       )
       .then(() => onSetFullPath && onSetFullPath(pathName))
       .then(() => onSelectFolder && onSelectFolder(folder[0]))
@@ -416,7 +416,7 @@ class SelectFolderDialog extends React.Component {
 
   static getFolderPath = async (folderId) => {
     const foldersArray = await getFolderPath(folderId);
-    const convertFoldersArray = SelectFolderModal.setFullFolderPath(
+    const convertFoldersArray = SelectFolderInput.setFullFolderPath(
       foldersArray
     );
 

products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js

@@ -5,15 +5,15 @@ import PropTypes from "prop-types";
 
 import stores from "../../../store/index";
 import SelectFolderDialog from "../SelectFolderDialog/index";
-import StyledComponent from "./styledSelectFolderInput";
+import StyledComponent from "./StyledSelectFolderInput";
 import SimpleFileInput from "../../SimpleFileInput";
 
 let path = "";
 
-class SelectFolder extends React.PureComponent {
+class SelectFolderInputBody extends React.PureComponent {
   constructor(props) {
     super(props);
-    this.inputRef = React.createRef();
+
     this.state = {
       isLoading: false,
       baseFolderPath: "",
@@ -133,7 +133,7 @@ class SelectFolder extends React.PureComponent {
   }
 }
 
-SelectFolder.propTypes = {
+SelectFolderInputBody.propTypes = {
   onClickInput: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
   onSelectFolder: PropTypes.func.isRequired,
@@ -146,14 +146,14 @@ SelectFolder.propTypes = {
   foldersType: PropTypes.oneOf(["common", "third-party"]),
 };
 
-SelectFolder.defaultProps = {
+SelectFolderInputBody.defaultProps = {
   withoutProvider: false,
   isDisabled: false,
   isError: false,
   folderPath: "",
 };
 
-class SelectFolderModal extends React.Component {
+class SelectFolderInput extends React.Component {
   static setFullFolderPath = (foldersArray) => {
     path = "";
     if (foldersArray.length > 1) {
@@ -172,10 +172,10 @@ class SelectFolderModal extends React.Component {
   render() {
     return (
       <MobxProvider {...stores}>
-        <SelectFolder {...this.props} />
+        <SelectFolderInputBody {...this.props} />
       </MobxProvider>
     );
   }
 }
 
-export default SelectFolderModal;
+export default SelectFolderInput;