WEb: Backup: Added constants.

This commit is contained in:
Tatiana Lopaeva 2022-03-04 17:00:04 +03:00
parent d6fe627217
commit 1fce535cfb
7 changed files with 39 additions and 35 deletions

View File

@ -159,6 +159,8 @@ export const ThirdPartyStorages = Object.freeze({
export const BackupTypes = Object.freeze({ export const BackupTypes = Object.freeze({
DocumentModuleType: 0, DocumentModuleType: 0,
ResourcesModuleType: 1, ResourcesModuleType: 1,
LocalFileModuleType: 3,
TemporaryModuleType: 4,
StorageModuleType: 5, StorageModuleType: 5,
EveryDayType: 0, EveryDayType: 0,

View File

@ -577,16 +577,6 @@ class AutomaticBackup extends React.PureComponent {
isChangedInStorage, isChangedInStorage,
} = this.state; } = this.state;
console.log(
"backupSchedule",
DocumentModuleType,
ResourcesModuleType,
StorageModuleType,
EveryDayType,
EveryWeekType,
EveryMonthType
);
const isDisabledThirdPartyList = !!this.commonThirdPartyList; const isDisabledThirdPartyList = !!this.commonThirdPartyList;
const commonProps = { const commonProps = {
@ -607,7 +597,7 @@ class AutomaticBackup extends React.PureComponent {
className: "backup_radio-button", className: "backup_radio-button",
onClick: this.onClickShowStorage, onClick: this.onClickShowStorage,
}; };
console.log("render auto "); console.log("render auto ", this.state);
return isInitialLoading ? ( return isInitialLoading ? (
<Loader className="pageLoader" type="rombs" size="40px" /> <Loader className="pageLoader" type="rombs" size="40px" />
@ -742,11 +732,7 @@ export default inject(({ auth, backup }) => {
selectedHour, selectedHour,
selectedMonthDay, selectedMonthDay,
selectedMaxCopiesNumber, selectedMaxCopiesNumber,
setPeriod,
setMonthNumber,
setTime,
setMaxCopies,
setWeekday,
selectedPeriodNumber, selectedPeriodNumber,
backupSchedule, backupSchedule,
deleteSchedule, deleteSchedule,
@ -758,7 +744,7 @@ export default inject(({ auth, backup }) => {
const isCheckedThirdParty = selectedStorageType === `${ResourcesModuleType}`; const isCheckedThirdParty = selectedStorageType === `${ResourcesModuleType}`;
const isCheckedThirdPartyStorage = const isCheckedThirdPartyStorage =
selectedStorageType === `${StorageModuleType}`; selectedStorageType === `${StorageModuleType}`;
return { return {
language, language,
setThirdPartyStorage, setThirdPartyStorage,
@ -774,11 +760,7 @@ export default inject(({ auth, backup }) => {
selectedHour, selectedHour,
selectedMonthDay, selectedMonthDay,
selectedMaxCopiesNumber, selectedMaxCopiesNumber,
setPeriod,
setMonthNumber,
setTime,
setMaxCopies,
setWeekday,
selectedPeriodNumber, selectedPeriodNumber,
backupSchedule, backupSchedule,
deleteSchedule, deleteSchedule,

View File

@ -16,6 +16,7 @@ import SelectFolderDialog from "files/SelectFolderDialog";
import Loader from "@appserver/components/loader"; import Loader from "@appserver/components/loader";
import { saveToSessionStorage, getFromSessionStorage } from "../../../../utils"; import { saveToSessionStorage, getFromSessionStorage } from "../../../../utils";
import { isDesktop } from "@appserver/components/utils/device"; import { isDesktop } from "@appserver/components/utils/device";
import { BackupTypes } from "@appserver/common/constants";
let selectedStorageType = ""; let selectedStorageType = "";
@ -137,18 +138,19 @@ class ManualBackup extends React.Component {
onMakeTemporaryBackup = () => { onMakeTemporaryBackup = () => {
const { isDesktop, setBackupProgress } = this.props; const { isDesktop, setBackupProgress } = this.props;
const { TemporaryModuleType } = BackupTypes;
saveToSessionStorage("LocalCopyStorageType", "TemporaryStorage"); saveToSessionStorage("LocalCopyStorageType", "TemporaryStorage");
if (isDesktop) { if (isDesktop) {
startBackup("4", null) startBackup(`${TemporaryModuleType}`, null)
.then(() => setBackupProgress()) .then(() => setBackupProgress())
.catch((err) => { .catch((err) => {
toastr.error(`${t("BackupCreatedError")}`); toastr.error(`${t("BackupCreatedError")}`);
console.error(err); console.error(err);
}); });
} else { } else {
startBackup("4", null) startBackup(`${TemporaryModuleType}`, null)
.then(() => .then(() =>
this.setState({ this.setState({
downloadingProgress: 1, downloadingProgress: 1,

View File

@ -3,6 +3,7 @@ import { withTranslation } from "react-i18next";
import SelectFolderInput from "files/SelectFolderInput"; import SelectFolderInput from "files/SelectFolderInput";
import Button from "@appserver/components/button"; import Button from "@appserver/components/button";
import { getFromSessionStorage } from "../../../../../utils"; import { getFromSessionStorage } from "../../../../../utils";
import { BackupTypes } from "@appserver/common/constants";
let folderPath = ""; let folderPath = "";
let folder = ""; let folder = "";
@ -42,12 +43,18 @@ class DocumentsModule extends React.Component {
onMakeCopy = async () => { onMakeCopy = async () => {
const { onMakeCopy } = this.props; const { onMakeCopy } = this.props;
const { selectedFolder } = this.state; const { selectedFolder } = this.state;
const { DocumentModuleType } = BackupTypes;
this.setState({ this.setState({
isStartCopy: true, isStartCopy: true,
}); });
await onMakeCopy(selectedFolder, "Documents", "0", "folderId"); await onMakeCopy(
selectedFolder,
"Documents",
`${DocumentModuleType}`,
"folderId"
);
this.setState({ this.setState({
isStartCopy: false, isStartCopy: false,

View File

@ -64,7 +64,7 @@ class ThirdPartyModule extends React.Component {
onMakeCopy = async () => { onMakeCopy = async () => {
const { onMakeCopy } = this.props; const { onMakeCopy } = this.props;
const { selectedFolder, isError } = this.state; const { selectedFolder, isError } = this.state;
const { ResourcesModuleType } = BackupTypes;
if (this.isInvalidForm()) return; if (this.isInvalidForm()) return;
isError && isError &&
@ -76,7 +76,12 @@ class ThirdPartyModule extends React.Component {
isStartCopy: true, isStartCopy: true,
}); });
await onMakeCopy(selectedFolder, "ThirdPartyResource", "1", "folderId"); await onMakeCopy(
selectedFolder,
"ThirdPartyResource",
`${ResourcesModuleType}`,
"folderId"
);
this.setState({ this.setState({
isStartCopy: false, isStartCopy: false,

View File

@ -8,7 +8,7 @@ import RackspaceStorage from "./storages/RackspaceStorage";
import SelectelStorage from "./storages/SelectelStorage"; import SelectelStorage from "./storages/SelectelStorage";
import AmazonStorage from "./storages/AmazonStorage"; import AmazonStorage from "./storages/AmazonStorage";
import { getOptions } from "../../GetOptions"; import { getOptions } from "../../GetOptions";
import { ThirdPartyStorages } from "@appserver/common/constants"; import { BackupTypes, ThirdPartyStorages } from "@appserver/common/constants";
import { getFromSessionStorage } from "../../../../../utils"; import { getFromSessionStorage } from "../../../../../utils";
import { StyledManualBackup } from "../../StyledBackup"; import { StyledManualBackup } from "../../StyledBackup";
@ -75,6 +75,7 @@ class ThirdPartyStorageModule extends React.PureComponent {
onMakeCopyIntoStorage = async (arraySettings) => { onMakeCopyIntoStorage = async (arraySettings) => {
const { selectedId, selectedStorage } = this.state; const { selectedId, selectedStorage } = this.state;
const { onMakeCopy } = this.props; const { onMakeCopy } = this.props;
const { StorageModuleType } = BackupTypes;
let obj = {}; let obj = {};
let inputValueArray = []; let inputValueArray = [];
@ -95,7 +96,7 @@ class ThirdPartyStorageModule extends React.PureComponent {
await onMakeCopy( await onMakeCopy(
null, null,
"ThirdPartyStorage", "ThirdPartyStorage",
"5", `${StorageModuleType}`,
"module", "module",
selectedId, selectedId,
inputValueArray, inputValueArray,

View File

@ -16,14 +16,19 @@ import ThirdPartyStorages from "./sub-components/ThirdPartyStoragesModule";
import LocalFile from "./sub-components/LocalFileModule"; import LocalFile from "./sub-components/LocalFileModule";
import toastr from "@appserver/components/toast/toastr"; import toastr from "@appserver/components/toast/toastr";
import { getBackupProgress, startRestore } from "@appserver/common/api/portal"; import { getBackupProgress, startRestore } from "@appserver/common/api/portal";
import { getSettings } from "@appserver/common/api/settings";
import { combineUrl } from "@appserver/common/utils"; import { combineUrl } from "@appserver/common/utils";
import { AppServerConfig } from "@appserver/common/constants"; import { AppServerConfig, BackupTypes } from "@appserver/common/constants";
import config from "../../../../../../../../package.json"; import config from "../../../../../../../../package.json";
import FloatingButton from "@appserver/common/components/FloatingButton"; import FloatingButton from "@appserver/common/components/FloatingButton";
import { request } from "@appserver/common/api/client"; import { request } from "@appserver/common/api/client";
import { inject, observer } from "mobx-react"; import { inject, observer } from "mobx-react";
const {
DocumentModuleType,
ResourcesModuleType,
StorageModuleType,
LocalFileModuleType,
} = BackupTypes;
class RestoreBackup extends React.Component { class RestoreBackup extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -276,12 +281,12 @@ class RestoreBackup extends React.Component {
const backupId = ""; const backupId = "";
const storageType = isCheckedDocuments const storageType = isCheckedDocuments
? "0" ? `${DocumentModuleType}`
: isCheckedThirdParty : isCheckedThirdParty
? "1" ? `${ResourcesModuleType}`
: isCheckedLocalFile : isCheckedLocalFile
? "3" ? `${LocalFileModuleType}`
: "5"; : `${StorageModuleType}`;
if (isCheckedThirdPartyStorage) { if (isCheckedThirdPartyStorage) {
storageParams.push({ storageParams.push({