Web: Files: SelectFileDialog: Deleted useless code, refactoring.

This commit is contained in:
Tatiana Lopaeva 2021-06-23 18:12:36 +03:00
parent ca53b21a60
commit 0231382a50

View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { Provider as MobxProvider } from "mobx-react"; import { Provider as MobxProvider } from "mobx-react";
import { inject, observer } from "mobx-react";
import { I18nextProvider } from "react-i18next"; import { I18nextProvider } from "react-i18next";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
@ -11,13 +11,12 @@ import ModalDialog from "@appserver/components/modal-dialog";
import SelectFolderDialog from "../SelectFolderDialog"; import SelectFolderDialog from "../SelectFolderDialog";
import FolderTreeBody from "../SelectFolderDialog/folderTreeBody"; import FolderTreeBody from "../SelectFolderDialog/folderTreeBody";
import FileListBody from "./fileListBody"; import FileListBody from "./fileListBody";
import Button from "@appserver/components/button";
class SelectFileDialogModalViewBody extends React.Component { class SelectFileDialogModalViewBody extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
isLoadingData: false, isLoading: false,
isAvailableFolders: true,
certainFolders: true,
}; };
this.backupList; this.backupList;
this.convertedData = []; this.convertedData = [];
@ -37,7 +36,7 @@ class SelectFileDialogModalViewBody extends React.Component {
onSetLoadingData && onSetLoadingData(false); onSetLoadingData && onSetLoadingData(false);
this.setState({ this.setState({
isLoadingData: false, isLoading: false,
}); });
}); });
break; break;
@ -50,7 +49,7 @@ class SelectFileDialogModalViewBody extends React.Component {
onSetLoadingData && onSetLoadingData(false); onSetLoadingData && onSetLoadingData(false);
this.setState({ this.setState({
isLoadingData: false, isLoading: false,
}); });
}); });
break; break;
@ -78,8 +77,12 @@ class SelectFileDialogModalViewBody extends React.Component {
onFileClick, onFileClick,
filesList, filesList,
isLoadingData, isLoadingData,
hasNextPage,
isNextPageLoading,
loadNextPage,
selectedFolder,
} = this.props; } = this.props;
const { isAvailableFolders } = this.state; const { isAvailableFolders, isLoading } = this.state;
console.log("filesList", filesList); console.log("filesList", filesList);
return ( return (
<StyledAsidePanel visible={isPanelVisible}> <StyledAsidePanel visible={isPanelVisible}>
@ -92,7 +95,7 @@ class SelectFileDialogModalViewBody extends React.Component {
displayType="modal" displayType="modal"
> >
<ModalDialog.Header>{t("SelectFile")}</ModalDialog.Header> <ModalDialog.Header>{t("SelectFile")}</ModalDialog.Header>
<ModalDialog.Body> <ModalDialog.Body className="select-file_body-modal-dialog">
<StyledSelectFilePanel> <StyledSelectFilePanel>
<div className="modal-dialog_body"> <div className="modal-dialog_body">
<div className="modal-dialog_tree-body"> <div className="modal-dialog_tree-body">
@ -102,7 +105,7 @@ class SelectFileDialogModalViewBody extends React.Component {
onSelect={this.onSelect} onSelect={this.onSelect}
isCommonWithoutProvider={isCommonWithoutProvider} isCommonWithoutProvider={isCommonWithoutProvider}
certainFolders certainFolders
isAvailableFolders={isAvailableFolders} isAvailableFolders
filter={filter} filter={filter}
/> />
</div> </div>
@ -111,6 +114,10 @@ class SelectFileDialogModalViewBody extends React.Component {
isLoadingData={isLoadingData} isLoadingData={isLoadingData}
filesList={filesList} filesList={filesList}
onFileClick={onFileClick} onFileClick={onFileClick}
hasNextPage={hasNextPage}
isNextPageLoading={isNextPageLoading}
loadNextPage={loadNextPage}
selectedFolder={selectedFolder}
/> />
</div> </div>
</div> </div>
@ -123,7 +130,7 @@ class SelectFileDialogModalViewBody extends React.Component {
size="big" size="big"
label={t("Common:CloseButton")} label={t("Common:CloseButton")}
tabIndex={1} tabIndex={1}
onClick={onModalClose} onClick={onClose}
/> />
</ModalDialog.Footer> </ModalDialog.Footer>
</ModalDialog> </ModalDialog>
@ -132,26 +139,12 @@ class SelectFileDialogModalViewBody extends React.Component {
} }
} }
const SelectFileDialogModalViewWrapper = inject(
({ filesStore, treeFoldersStore, selectedFolderStore }) => {
const { getBackupFiles, filter } = filesStore;
const { expandedPanelKeys } = treeFoldersStore;
return {
getBackupFiles,
expandedKeys: expandedPanelKeys
? expandedPanelKeys
: selectedFolderStore.pathParts,
filter,
};
}
)(observer(SelectFileDialogModalViewBody));
class SelectFileDialogModalView extends React.Component { class SelectFileDialogModalView extends React.Component {
render() { render() {
return ( return (
<MobxProvider {...stores}> <MobxProvider {...stores}>
<I18nextProvider i18n={i18n}> <I18nextProvider i18n={i18n}>
<SelectFileDialogModalViewWrapper {...this.props} /> <SelectFileDialogModalViewBody {...this.props} />
</I18nextProvider> </I18nextProvider>
</MobxProvider> </MobxProvider>
); );