Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
This commit is contained in:
commit
cb864b23be
@ -5,7 +5,7 @@
|
||||
"Benefits": "Benefits",
|
||||
"BusinessExpired": "Your {{planName}} plan has expired on {{date}}",
|
||||
"BusinessFinalDateInfo": "Subscription will be automatically renewed on {{finalDate}} with updated pricing and specifications. You can cancel it or change your billing info on your Stripe customer portal.",
|
||||
"BusinessPlanPaymentOverdue": "Cannot add new users. {{planName}} plan payment overdue",
|
||||
"BusinessPlanPaymentOverdue": "Cannot add new users and create new rooms. {{planName}} plan payment overdue",
|
||||
"BusinessRequestDescription": "The pricing plans with more {{peopleNumber}} managers are available upon request only",
|
||||
"BusinessSuggestion": "Customize your {{planName}} plan",
|
||||
"BusinessTitle": "You are using {{planName}} plan",
|
||||
|
@ -5,7 +5,7 @@
|
||||
"Benefits": "Преимущества",
|
||||
"BusinessExpired": "Срок действия вашего {{planName}} тарифа истек {{date}}",
|
||||
"BusinessFinalDateInfo": "Подписка будет автоматически продлена {{finalDate}} с обновленными ценами и техническими характеристиками. Вы можете отменить его или изменить свою платежную информацию на клиентском портале Stripe.",
|
||||
"BusinessPlanPaymentOverdue": "Невозможно добавить новых пользователей. Просрочена оплата {{planName}} плана",
|
||||
"BusinessPlanPaymentOverdue": "Невозможно добавить новых пользователей и создавать новые комнаты. Просрочена оплата {{planName}} плана",
|
||||
"BusinessRequestDescription": "Тарифные планы с более чем {{peopleNumber}} менеджерами доступны только по запросу",
|
||||
"BusinessSuggestion": "Настройте свой {{planName}} план",
|
||||
"BusinessTitle": "Вы используете {{planName}} план",
|
||||
|
@ -56,6 +56,8 @@ const withHotkeys = (Component) => {
|
||||
isVisitor,
|
||||
deleteRooms,
|
||||
archiveRooms,
|
||||
isGracePeriod,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
} = props;
|
||||
|
||||
const hotkeysFilter = {
|
||||
@ -98,6 +100,11 @@ const withHotkeys = (Component) => {
|
||||
|
||||
const onCreateRoom = () => {
|
||||
if (!isVisitor && isRoomsFolder) {
|
||||
if (isGracePeriod) {
|
||||
setInviteUsersWarningDialogVisible(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const event = new Event(Events.ROOM_CREATE);
|
||||
window.dispatchEvent(event);
|
||||
}
|
||||
@ -387,6 +394,7 @@ const withHotkeys = (Component) => {
|
||||
setDeleteDialogVisible,
|
||||
setSelectFileDialogVisible,
|
||||
someDialogIsOpen,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
} = dialogsStore;
|
||||
const {
|
||||
isAvailableOption,
|
||||
@ -400,6 +408,7 @@ const withHotkeys = (Component) => {
|
||||
const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
|
||||
const { setHotkeyPanelVisible } = auth.settingsStore;
|
||||
const { isVisitor } = auth.userStore.user;
|
||||
const { isGracePeriod } = auth.currentTariffStatusStore;
|
||||
|
||||
const {
|
||||
isFavoritesFolder,
|
||||
@ -457,6 +466,9 @@ const withHotkeys = (Component) => {
|
||||
isVisitor,
|
||||
deleteRooms,
|
||||
archiveRooms,
|
||||
|
||||
isGracePeriod,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
};
|
||||
}
|
||||
)(observer(WithHotkeys));
|
||||
|
@ -154,6 +154,11 @@ const ArticleMainButtonContent = (props) => {
|
||||
);
|
||||
|
||||
const onCreateRoom = React.useCallback(() => {
|
||||
if (isGracePeriod) {
|
||||
setInviteUsersWarningDialogVisible(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const event = new Event(Events.ROOM_CREATE);
|
||||
window.dispatchEvent(event);
|
||||
}, []);
|
||||
|
@ -23,6 +23,8 @@ const EmptyContainer = ({
|
||||
setCreateRoomDialogVisible,
|
||||
sectionWidth,
|
||||
isRoomNotFoundOrMoved,
|
||||
isGracePeriod,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
}) => {
|
||||
linkStyles.color = theme.filesEmptyContainer.linkColor;
|
||||
|
||||
@ -41,6 +43,11 @@ const EmptyContainer = ({
|
||||
};
|
||||
|
||||
const onCreateRoom = (e) => {
|
||||
if (isGracePeriod) {
|
||||
setInviteUsersWarningDialogVisible(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const event = new Event(Events.ROOM_CREATE);
|
||||
window.dispatchEvent(event);
|
||||
};
|
||||
@ -105,9 +112,14 @@ export default inject(
|
||||
isArchiveFolder,
|
||||
} = treeFoldersStore;
|
||||
|
||||
const { isGracePeriod } = auth.currentTariffStatusStore;
|
||||
|
||||
const isRooms = isRoomsFolder || isArchiveFolder;
|
||||
|
||||
const { setCreateRoomDialogVisible } = dialogsStore;
|
||||
const {
|
||||
setCreateRoomDialogVisible,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
} = dialogsStore;
|
||||
|
||||
const isFiltered = isRooms
|
||||
? filterValue ||
|
||||
@ -136,6 +148,8 @@ export default inject(
|
||||
|
||||
parentId: selectedFolderStore.parentId,
|
||||
isRoomNotFoundOrMoved,
|
||||
isGracePeriod,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
};
|
||||
}
|
||||
)(observer(EmptyContainer));
|
||||
|
@ -109,6 +109,11 @@ class SectionHeaderContent extends React.Component {
|
||||
};
|
||||
|
||||
onCreateRoom = () => {
|
||||
if (this.props.isGracePeriod) {
|
||||
this.props.setInviteUsersWarningDialogVisible(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const event = new Event(Events.ROOM_CREATE);
|
||||
window.dispatchEvent(event);
|
||||
};
|
||||
@ -799,6 +804,7 @@ export default inject(
|
||||
setArchiveDialogVisible,
|
||||
setRestoreAllArchive,
|
||||
setArchiveAction,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
} = dialogsStore;
|
||||
|
||||
const {
|
||||
@ -832,6 +838,7 @@ export default inject(
|
||||
const selectedFolder = { ...selectedFolderStore };
|
||||
|
||||
const { enablePlugins } = auth.settingsStore;
|
||||
const { isGracePeriod } = auth.currentTariffStatusStore;
|
||||
|
||||
const isRoom = !!roomType;
|
||||
|
||||
@ -851,6 +858,8 @@ export default inject(
|
||||
const isEmptyArchive = !canRestoreAll && !canDeleteAll;
|
||||
|
||||
return {
|
||||
isGracePeriod,
|
||||
setInviteUsersWarningDialogVisible,
|
||||
showText: auth.settingsStore.showText,
|
||||
isDesktop: auth.settingsStore.isDesktopClient,
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user