Web: RestoreBackup: Refactoring.
This commit is contained in:
parent
b0eb883e20
commit
cad67a6f57
@ -82,7 +82,6 @@ class SelectFileDialog extends React.Component {
|
||||
const {
|
||||
treeFolders,
|
||||
foldersType,
|
||||
id,
|
||||
onSetBaseFolderPath,
|
||||
onSelectFolder,
|
||||
foldersList,
|
||||
@ -192,17 +191,8 @@ class SelectFileDialog extends React.Component {
|
||||
};
|
||||
|
||||
onClickSave = () => {
|
||||
const {
|
||||
onSetFileNameAndLocation,
|
||||
onClose,
|
||||
onSelectFile,
|
||||
fileInfo,
|
||||
folderId,
|
||||
} = this.props;
|
||||
const { onClose, onSelectFile, fileInfo } = this.props;
|
||||
|
||||
const fileName = fileInfo.title;
|
||||
|
||||
onSetFileNameAndLocation && onSetFileNameAndLocation(fileName, folderId);
|
||||
onSelectFile && onSelectFile(fileInfo);
|
||||
onClose && onClose();
|
||||
};
|
||||
|
@ -6,27 +6,21 @@ import SelectFileDialog from "../SelectFileDialog";
|
||||
import StyledComponent from "./StyledSelectFileInput";
|
||||
import SimpleFileInput from "../../SimpleFileInput";
|
||||
|
||||
class SelectFileInputBody extends React.PureComponent {
|
||||
class SelectFileInput extends React.PureComponent {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
fileName: "",
|
||||
folderId: "",
|
||||
};
|
||||
const { setExpandedPanelKeys, setFolderId, setFile } = props;
|
||||
|
||||
setExpandedPanelKeys(null);
|
||||
setFolderId(null);
|
||||
setFile(null);
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.props.setFirstLoad(false);
|
||||
}
|
||||
|
||||
onSetFileNameAndLocation = (fileName, id) => {
|
||||
this.setState({
|
||||
fileName: fileName,
|
||||
folderId: id,
|
||||
});
|
||||
};
|
||||
|
||||
render() {
|
||||
const {
|
||||
onClickInput,
|
||||
@ -38,11 +32,12 @@ class SelectFileInputBody extends React.PureComponent {
|
||||
isPanelVisible,
|
||||
isDisabled,
|
||||
isError,
|
||||
fileName,
|
||||
folderId,
|
||||
...rest
|
||||
} = this.props;
|
||||
|
||||
const { fileName, folderId } = this.state;
|
||||
|
||||
console.log("folderId", folderId, "fileName", fileName);
|
||||
return (
|
||||
<StyledComponent maxInputWidth={maxInputWidth}>
|
||||
<SimpleFileInput
|
||||
@ -67,32 +62,31 @@ class SelectFileInputBody extends React.PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
SelectFileInputBody.propTypes = {
|
||||
SelectFileInput.propTypes = {
|
||||
onClickInput: PropTypes.func.isRequired,
|
||||
hasError: PropTypes.bool,
|
||||
placeholder: PropTypes.string,
|
||||
};
|
||||
|
||||
SelectFileInputBody.defaultProps = {
|
||||
SelectFileInput.defaultProps = {
|
||||
hasError: false,
|
||||
placeholder: "",
|
||||
};
|
||||
|
||||
const SelectFileInputBodyWrapper = inject(({ filesStore }) => {
|
||||
export default inject(
|
||||
({ filesStore, treeFoldersStore, selectFileDialogStore }) => {
|
||||
const { setFirstLoad } = filesStore;
|
||||
const { folderId, setFolderId, setFile, fileInfo } = selectFileDialogStore;
|
||||
const fileName = fileInfo?.title;
|
||||
const { setExpandedPanelKeys } = treeFoldersStore;
|
||||
return {
|
||||
setFirstLoad,
|
||||
setFolderId,
|
||||
setFile,
|
||||
fileInfo,
|
||||
folderId,
|
||||
fileName,
|
||||
setExpandedPanelKeys,
|
||||
};
|
||||
})(observer(SelectFileInputBody));
|
||||
|
||||
class SelectFileInput extends React.Component {
|
||||
render() {
|
||||
return (
|
||||
<MobxProvider {...stores}>
|
||||
<SelectFileInputBodyWrapper {...this.props} />
|
||||
</MobxProvider>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default SelectFileInput;
|
||||
)(observer(SelectFileInput));
|
||||
|
@ -41,7 +41,7 @@ class AutomaticBackup extends React.PureComponent {
|
||||
|
||||
this.state = {
|
||||
isLoadingData: false,
|
||||
isInitialLoading: !isMobileOnly ? false : true,
|
||||
isInitialLoading: true,
|
||||
isError: false,
|
||||
};
|
||||
|
||||
@ -97,13 +97,13 @@ class AutomaticBackup extends React.PureComponent {
|
||||
thirdPartyList && setCommonThirdPartyList(thirdPartyList);
|
||||
|
||||
setDefaultOptions(t, this.periodsObject, this.weekdaysLabelArray);
|
||||
} catch (error) {
|
||||
toastr.error(error);
|
||||
}
|
||||
|
||||
this.setState({
|
||||
isInitialLoading: false,
|
||||
});
|
||||
} catch (error) {
|
||||
toastr.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -46,7 +46,7 @@ class RestoreBackup extends React.Component {
|
||||
isCheckedLocalFile: false,
|
||||
selectedFileId: "",
|
||||
selectedFile: "",
|
||||
isStorageFillingError: {},
|
||||
|
||||
isFileSelectedError: false,
|
||||
isInitialLoading: true,
|
||||
checkingRecoveryData: false,
|
||||
@ -60,7 +60,6 @@ class RestoreBackup extends React.Component {
|
||||
];
|
||||
|
||||
this.storageId = "";
|
||||
this.formSettings = "";
|
||||
}
|
||||
|
||||
setBasicSettings = async () => {
|
||||
@ -291,27 +290,10 @@ class RestoreBackup extends React.Component {
|
||||
});
|
||||
};
|
||||
|
||||
onSetRequiredFormNames = (namesArray) => {
|
||||
this.formNames = namesArray;
|
||||
};
|
||||
|
||||
onResetFormSettings = () => {
|
||||
this.formSettings = {};
|
||||
this.setState({
|
||||
isStorageFillingError: {},
|
||||
});
|
||||
};
|
||||
|
||||
onSetStorageId = (storageId) => {
|
||||
this.storageId = storageId;
|
||||
};
|
||||
|
||||
onSetFormSettings = (name, value) => {
|
||||
this.formSettings = {
|
||||
...this.formSettings,
|
||||
...{ [name]: value },
|
||||
};
|
||||
};
|
||||
render() {
|
||||
const {
|
||||
t,
|
||||
@ -416,11 +398,8 @@ class RestoreBackup extends React.Component {
|
||||
)}
|
||||
{isCheckedThirdPartyStorage && (
|
||||
<ThirdPartyStorages
|
||||
onSetRequiredFormNames={this.onSetRequiredFormNames}
|
||||
onResetFormSettings={this.onResetFormSettings}
|
||||
isErrors={isStorageFillingError}
|
||||
onSetStorageId={this.onSetStorageId}
|
||||
onSetFormSettings={this.onSetFormSettings}
|
||||
/>
|
||||
)}
|
||||
{isCheckedLocalFile && (
|
||||
|
Loading…
Reference in New Issue
Block a user