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

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

@@ -40,9 +40,9 @@ const SelectFileDialogAsideView = ({
   isTranslationsReady,
   passedId,
 }) => {
-  const [isLoadingDate, setIsLoadingDate] = useState(false);
+  const [isLoadingData, setIsLoadingData] = useState(false);
   const onSetLoadingData = (loading) => {
-    setIsLoadingDate(loading);
+    setIsLoadingData(loading);
   };
 
   return (
@@ -87,7 +87,7 @@ const SelectFileDialogAsideView = ({
                   displayType={displayType}
                 />
 
-                {selectedFolder && !isLoadingDate && (
+                {selectedFolder && !isLoadingData && (
                   <FilesListBody
                     filesList={filesList}
                     onSelectFile={onSelectFile}
@@ -98,7 +98,6 @@ const SelectFileDialogAsideView = ({
                     displayType={DISPLAY_TYPE}
                     loadingText={loadingText}
                     selectedFile={selectedFile}
-                    isLoadingDate={isLoadingDate}
                   />
                 )}
               </div>

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

@@ -127,7 +127,6 @@ const FilesListBody = ({
           >
             {({ onItemsRendered, ref }) => (
               <List
-                className="options_list"
                 height={displayType === "aside" ? height : listHeight}
                 itemCount={itemCount}
                 itemSize={displayType === "aside" ? 56 : 36}

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

@@ -155,7 +155,7 @@ class SelectFileDialogBody extends React.Component {
     const { setSelectedNode, setSelectedFolder } = this.props;
     const { selectedFolder, page } = this.state;
 
-    //console.log(`loadNextPage(startIndex=${page}")`);
+    console.log(`loadNextPage(startIndex=${page}")`);
 
     const pageCount = 30;
     this.newFilter.page = page;

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

@@ -18,8 +18,6 @@ class SelectFileDialogModalViewBody extends React.Component {
     this.state = {
       isLoading: true,
     };
-    this.backupList;
-    this.convertedData = [];
     this.folderList = "";
   }
 
@@ -170,7 +168,7 @@ class SelectFileDialogModalViewBody extends React.Component {
       onClickSave,
     } = this.props;
     const { isLoading } = this.state;
-    console.log("isLoading", isLoading);
+
     return (
       <StyledAsidePanel visible={isPanelVisible}>
         <ModalDialog

products/ASC.Files/Client/src/store/IconFormatsStore.js

@@ -234,8 +234,7 @@ class IconFormatsStore {
     sound = false,
     html = false
   ) => {
-    const folderPath =
+    const folderPath = `/static/images/icons/${size}`;
-      size === 24 ? `/static/images/icons/${size}` : `images/icons/${size}`;
 
     if (archive) return `${folderPath}/file_archive.svg`;
 
@@ -316,8 +315,7 @@ class IconFormatsStore {
   };
 
   getIconSrc = (ext, size = 24) => {
-    const folderPath =
+    const folderPath = `/static/images/icons/${size}`;
-      size === 24 ? `/static/images/icons/${size}` : `images/icons/${size}`;
 
     if (presentInArray(this.archive, ext, true))
       return `${folderPath}/file_archive.svg`;