IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WEb: AutoBackup: Refactoring, deleted useless code.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2022-03-11 15:55:43 +03:00
parent 0533670187
commit 32f4b30e3e
7 changed files with 61 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
View File

@ -1,26 +1,26 @@
import React from "react";
import Text from "@appserver/components/text";
import moment from "moment";
import { isMobileOnly } from "react-device-detect";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import RadioButton from "@appserver/components/radio-button";
import moment from "moment";
import Text from "@appserver/components/text";
import Button from "@appserver/components/button";
import {
deleteBackupSchedule,
getBackupSchedule,
createBackupSchedule,
} from "@appserver/common/api/portal";
import toastr from "@appserver/components/toast/toastr";
import SelectFolderDialog from "files/SelectFolderDialog";
import Loader from "@appserver/components/loader";
import toastr from "@appserver/components/toast/toastr";
import { BackupTypes } from "@appserver/common/constants";
import ToggleButton from "@appserver/components/toggle-button";
import { getBackupStorage } from "@appserver/common/api/settings";
import SelectFolderDialog from "files/SelectFolderDialog";
import { StyledModules, StyledAutoBackup } from "../StyledBackup";
import ThirdPartyModule from "./sub-components/ThirdPartyModule";
import DocumentsModule from "./sub-components/DocumentsModule";
import ThirdPartyStorageModule from "./sub-components/ThirdPartyStorageModule";
import ToggleButton from "@appserver/components/toggle-button";
import { getBackupStorage } from "@appserver/common/api/settings";
import { isMobileOnly } from "react-device-detect";
const {
DocumentModuleType,
@ -39,8 +39,6 @@ class AutomaticBackup extends React.PureComponent {
this.lng = language.substring(0, language.indexOf("-"));
moment.locale(this.lng);
this._isMounted = false;
this.state = {
isEnable: false,
isLoadingData: false,
@ -48,6 +46,8 @@ class AutomaticBackup extends React.PureComponent {
isAdditionalChanged: false,
isReset: false,
isSuccessSave: false,
isErrorsFields: [],
isError: false,
};
this.periodsObject = [
@ -65,12 +65,10 @@ class AutomaticBackup extends React.PureComponent {
},
];
this._isMounted = false;
this.hoursArray = [];
this.monthNumbersArray = [];
this.maxNumberCopiesArray = [];
this.weekdaysLabelArray = [];
this.timerId = null;
this.formSettings = "";
this.getTime();
@ -118,7 +116,6 @@ class AutomaticBackup extends React.PureComponent {
componentDidMount() {
const { setDefaultOptions, t, backupSchedule } = this.props;
this._isMounted = true;
this.getWeekdays();
if (!isMobileOnly) {
@ -153,7 +150,6 @@ class AutomaticBackup extends React.PureComponent {
componentWillUnmount() {
const { clearProgressInterval } = this.props;
this._isMounted = false;
clearProgressInterval();
}
@ -421,11 +417,9 @@ class AutomaticBackup extends React.PureComponent {
});
} catch (e) {
toastr.error(e);
this._isMounted &&
this.setState({
isLoadingData: false,
});
this.setState({
isLoadingData: false,
});
}
};
@ -438,7 +432,6 @@ class AutomaticBackup extends React.PureComponent {
toastr.success(t("SuccessfullySaveSettingsMessage"));
this.setState({
isLoadingData: false,
isAdditionalChanged: false,
});
})
@ -446,7 +439,6 @@ class AutomaticBackup extends React.PureComponent {
toastr.error(error);
this.setState({
isLoadingData: false,
isAdditionalChanged: false,
});
});
});
@ -489,7 +481,6 @@ class AutomaticBackup extends React.PureComponent {
isEnable,
isReset,
isLoadingData,
isError,
isSuccessSave,
isErrorsFields,
@ -625,33 +616,30 @@ class AutomaticBackup extends React.PureComponent {
export default inject(({ auth, backup }) => {
const { language } = auth;
const {
backupSchedule,
commonThirdPartyList,
clearProgressInterval,
deleteSchedule,
getProgress,
setThirdPartyStorage,
setDefaultOptions,
setBackupSchedule,
isChanged,
toDefault,
selectedStorageType,
seStorageType,
setCommonThirdPartyList,
selectedPeriodLabel,
selectedWeekdayLabel,
selectedWeekday,
selectedHour,
selectedMonthDay,
selectedMaxCopiesNumber,
selectedPeriodNumber,
backupSchedule,
deleteSchedule,
selectedFolderId,
selectedStorageId,
clearProgressInterval,
getProgress,
commonThirdPartyList,
isChanged,
toDefault,
} = backup;
const isCheckedDocuments = selectedStorageType === `${DocumentModuleType}`;
const isCheckedThirdParty = selectedStorageType === `${ResourcesModuleType}`;
const isCheckedThirdPartyStorage =
@ -659,30 +647,29 @@ export default inject(({ auth, backup }) => {
return {
language,
backupSchedule,
commonThirdPartyList,
clearProgressInterval,
deleteSchedule,
getProgress,
setThirdPartyStorage,
setDefaultOptions,
setBackupSchedule,
isChanged,
toDefault,
selectedStorageType,
seStorageType,
setCommonThirdPartyList,
selectedPeriodLabel,
selectedWeekdayLabel,
selectedWeekday,
selectedHour,
selectedMonthDay,
selectedMaxCopiesNumber,
selectedPeriodNumber,
backupSchedule,
deleteSchedule,
selectedFolderId,
selectedStorageId,
selectedWeekday,
clearProgressInterval,
getProgress,
commonThirdPartyList,
isChanged,
toDefault,
isCheckedThirdPartyStorage,
isCheckedThirdParty,

4
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
View File

@ -1,8 +1,8 @@
import React from "react";
import SelectFolderInput from "files/SelectFolderInput";
import ScheduleComponent from "./ScheduleComponent";
import { inject, observer } from "mobx-react";
import { BackupTypes } from "@appserver/common/constants";
import SelectFolderInput from "files/SelectFolderInput";
import ScheduleComponent from "./ScheduleComponent";
class DocumentsModule extends React.PureComponent {
constructor(props) {

47
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ScheduleComponent.js
View File

@ -1,40 +1,38 @@
import React from "react";
import ComboBox from "@appserver/components/combobox";
import { useTranslation } from "react-i18next";
import { StyledScheduleComponent } from "../../StyledBackup";
import Text from "@appserver/components/text";
import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
import ComboBox from "@appserver/components/combobox";
import Text from "@appserver/components/text";
import { StyledScheduleComponent } from "../../StyledBackup";
import { BackupTypes } from "@appserver/common/constants";
const { EveryWeekType, EveryMonthType } = BackupTypes;
const ScheduleComponent = ({
selectedPeriodLabel,
selectedWeekdayLabel,
selectedHour,
selectedMonthDay,
selectedMaxCopiesNumber,
setMaxCopies,
setPeriod,
setWeekday,
setMonthNumber,
setTime,
isLoadingData,
isDisableOptions,
periodsObject,
weekdaysLabelArray,
weeklySchedule,
monthNumbersArray,
hoursArray,
maxNumberCopiesArray,
selectedPeriodNumber,
monthlySchedule,
}) => {
const { t } = useTranslation("Settings");
return (
<StyledScheduleComponent
weeklySchedule={selectedPeriodNumber === "1"}
monthlySchedule={selectedPeriodNumber === "2"}
weeklySchedule={weeklySchedule}
monthlySchedule={monthlySchedule}
className="backup_schedule-component"
>
<Text className="schedule_description"> {t("AutoSavePeriod")}</Text>
@ -46,14 +44,14 @@ const ScheduleComponent = ({
label: selectedPeriodLabel,
}}
onSelect={setPeriod}
isDisabled={isLoadingData || isDisableOptions}
isDisabled={isLoadingData}
noBorder={false}
scaled={false}
scaledOptions={true}
dropDownMaxHeight={500}
className="schedule-backup_combobox days_option"
/>
{selectedPeriodNumber === "1" && (
{weeklySchedule && (
<ComboBox
options={weekdaysLabelArray}
selectedOption={{
@ -61,7 +59,7 @@ const ScheduleComponent = ({
label: selectedWeekdayLabel,
}}
onSelect={setWeekday}
isDisabled={isLoadingData || isDisableOptions}
isDisabled={isLoadingData}
noBorder={false}
scaled={false}
scaledOptions={true}
@ -69,7 +67,7 @@ const ScheduleComponent = ({
className="schedule-backup_combobox weekly_option"
/>
)}
{selectedPeriodNumber === "2" && (
{monthlySchedule && (
<ComboBox
options={monthNumbersArray}
selectedOption={{
@ -77,7 +75,7 @@ const ScheduleComponent = ({
label: selectedMonthDay,
}}
onSelect={setMonthNumber}
isDisabled={isLoadingData || isDisableOptions}
isDisabled={isLoadingData}
noBorder={false}
scaled={false}
scaledOptions={true}
@ -92,7 +90,7 @@ const ScheduleComponent = ({
label: selectedHour,
}}
onSelect={setTime}
isDisabled={isLoadingData || isDisableOptions}
isDisabled={isLoadingData}
noBorder={false}
scaled={false}
scaledOptions={true}
@ -110,7 +108,7 @@ const ScheduleComponent = ({
})}`,
}}
onSelect={setMaxCopies}
isDisabled={isLoadingData || isDisableOptions}
isDisabled={isLoadingData}
noBorder={false}
scaled={false}
scaledOptions={true}
@ -121,9 +119,6 @@ const ScheduleComponent = ({
</StyledScheduleComponent>
);
};
ScheduleComponent.defaultProps = {
isDisableOptions: false,
};
export default inject(({ backup }) => {
const {
@ -140,18 +135,22 @@ export default inject(({ backup }) => {
selectedPeriodNumber,
} = backup;
const weeklySchedule = +selectedPeriodNumber === EveryWeekType;
const monthlySchedule = +selectedPeriodNumber === EveryMonthType;
return {
selectedPeriodLabel,
selectedWeekdayLabel,
selectedHour,
selectedMonthDay,
selectedMaxCopiesNumber,
selectedPeriodNumber,
setPeriod,
setMonthNumber,
setTime,
setMaxCopies,
setWeekday,
weeklySchedule,
monthlySchedule,
};
})(observer(ScheduleComponent));

5
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
View File

@ -1,9 +1,10 @@
import React from "react";
import { withTranslation } from "react-i18next";
import SelectFolderInput from "files/SelectFolderInput";
import ScheduleComponent from "./ScheduleComponent";
import { inject, observer } from "mobx-react";
import { BackupTypes } from "@appserver/common/constants";
import SelectFolderInput from "files/SelectFolderInput";
import ScheduleComponent from "./ScheduleComponent";
class ThirdPartyModule extends React.PureComponent {
constructor(props) {
super(props);

6
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
View File

@ -1,13 +1,13 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { withTranslation } from "react-i18next";
import ComboBox from "@appserver/components/combobox";
import { ThirdPartyStorages } from "@appserver/common/constants";
import GoogleCloudStorage from "./storages/GoogleCloudStorage";
import RackspaceStorage from "./storages/RackspaceStorage";
import SelectelStorage from "./storages/SelectelStorage";
import AmazonStorage from "./storages/AmazonStorage";
import { ThirdPartyStorages } from "@appserver/common/constants";
import { StyledAutoBackup } from "../../StyledBackup";
import { inject, observer } from "mobx-react";
let googleStorageId = ThirdPartyStorages.GoogleId;
@ -32,7 +32,7 @@ class ThirdPartyStorageModule extends React.PureComponent {
this._isMount = false;
}
componentDidUpdate(prevProps) {
const { isSuccessSave, isReset, thirdPartyStorage } = this.props;
const { isSuccessSave, thirdPartyStorage } = this.props;
if (isSuccessSave && isSuccessSave !== prevProps.isSuccessSave) {
thirdPartyStorage && this.getOptions(thirdPartyStorage);

2
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/storages/SelectelStorage.js
View File

@ -63,7 +63,7 @@ class SelectelStorage extends React.Component {
if (isReset && isReset !== prevProps.isReset) {
onSetFormSettings(null, null, this.defaultFormSettings);
console.log("onSetFormSettings update", this.defaultFormSettings);
this.setState({
formSettings: {
...this.defaultFormSettings,

1
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
View File

@ -415,7 +415,6 @@ class RestoreBackup extends React.Component {
{isVisibleDialog && (
<BackupListModalDialog
t={t}
isVisibleDialog={isVisibleDialog}
onModalClose={this.onModalClose}
isNotify={isNotify}