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

Web: Settings: Auto Backup: Fixed problem with showing weekday from storage.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-06-22 22:11:15 +03:00
parent 1f22a0a4f8
commit 526a6b7839
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/automatic-backup.js
View File

@ -109,7 +109,7 @@ class AutomaticBackup extends React.PureComponent {
this.getMaxNumberCopies();
this.weekdaysOptions = [];
this.arrayWeekdays = moment.weekdays(true);
this.arrayWeekdays = moment.weekdays();
this._isMounted = false;
}
@ -241,7 +241,7 @@ class AutomaticBackup extends React.PureComponent {
if (+defaultPeriod === 1) {
//Every Week option
//debugger;
const arrayIndex = this.lng === "en" ? defaultDay : defaultDay - 1;
const arrayIndex = defaultDay - 1;
defaultWeekly = true;
this._isMounted &&
@ -362,10 +362,14 @@ class AutomaticBackup extends React.PureComponent {
};
this.weekdaysOptions.push(obj);
}
const isEnglishLanguage = this.lng === "en";
this._isMounted &&
this.setState({
weekOptions: this.weekdaysOptions,
selectedWeekdayOption: this.weekdaysOptions[0].label,
selectedWeekdayOption: isEnglishLanguage
? this.weekdaysOptions[0].label
: this.weekdaysOptions[1].label,
});
};

7
web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/documentsModule.js
View File

@ -44,9 +44,12 @@ class DocumentsModule extends React.Component {
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
//debugger;
console.log("weekOptions", weekOptions);
console.log("selectedWeekdayOption", selectedWeekdayOption);
//debugger;
const weekName =
numberPeriodFromSessionStorage === 2
? weekOptions[+dayFromSessionStorage].label
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
(weeklySchedule && dayFromSessionStorage)
? weekOptions[+dayFromSessionStorage - 1].label
: "";
const periodName = numberPeriodFromSessionStorage
? periodOptions[+numberPeriodFromSessionStorage - 1].label

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

@ -46,8 +46,9 @@ class ThirdPartyModule extends React.Component {
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
const weekName =
numberPeriodFromSessionStorage === 2
? weekOptions[+dayFromSessionStorage].label
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
(weeklySchedule && dayFromSessionStorage)
? weekOptions[+dayFromSessionStorage - 1].label
: "";
const periodName = numberPeriodFromSessionStorage
? periodOptions[+numberPeriodFromSessionStorage - 1].label

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

@ -57,6 +57,7 @@ class ThirdPartyStorageModule extends React.PureComponent {
monthlySchedule,
weeklySchedule,
periodOptions,
weekOptions,
} = this.props;
this.isSetDefaultIdStorage = false;
@ -66,8 +67,9 @@ class ThirdPartyStorageModule extends React.PureComponent {
maxCopiesFromSessionStorage = getFromSessionStorage("maxCopies");
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
const weekName =
numberPeriodFromSessionStorage === 2
? weekOptions[+dayFromSessionStorage].label
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
(weeklySchedule && dayFromSessionStorage)
? weekOptions[+dayFromSessionStorage - 1].label
: "";
const periodName = numberPeriodFromSessionStorage
? periodOptions[+numberPeriodFromSessionStorage - 1].label