Web: Added dialog display according to the new code logic.
This commit is contained in:
parent
bf72fbe33a
commit
870bfaa820
@ -25,6 +25,7 @@ import {
|
||||
} from "../dialogs";
|
||||
import ConvertPasswordDialog from "../dialogs/ConvertPasswordDialog";
|
||||
import ArchiveDialog from "../dialogs/ArchiveDialog";
|
||||
import PreparationPortalDialog from "../dialogs/PreparationPortalDialog";
|
||||
|
||||
const Panels = (props) => {
|
||||
const {
|
||||
@ -53,6 +54,7 @@ const Panels = (props) => {
|
||||
restoreAllPanelVisible,
|
||||
archiveDialogVisible,
|
||||
inviteUsersWarningDialogVisible,
|
||||
preparationPortalDialogVisible,
|
||||
} = props;
|
||||
|
||||
const { t } = useTranslation(["Translations", "Common"]);
|
||||
@ -119,11 +121,14 @@ const Panels = (props) => {
|
||||
inviteUsersWarningDialogVisible && (
|
||||
<InviteUsersWarningDialog key="invite-users-warning-dialog" />
|
||||
),
|
||||
preparationPortalDialogVisible && (
|
||||
<PreparationPortalDialog key="preparation-portal-dialog" />
|
||||
),
|
||||
];
|
||||
};
|
||||
|
||||
export default inject(
|
||||
({ auth, dialogsStore, uploadDataStore, versionHistoryStore }) => {
|
||||
({ auth, dialogsStore, uploadDataStore, versionHistoryStore, backup }) => {
|
||||
const {
|
||||
sharingPanelVisible,
|
||||
ownerPanelVisible,
|
||||
@ -151,11 +156,14 @@ export default inject(
|
||||
inviteUsersWarningDialogVisible,
|
||||
} = dialogsStore;
|
||||
|
||||
const { preparationPortalDialogVisible } = backup;
|
||||
|
||||
const { uploadPanelVisible } = uploadDataStore;
|
||||
const { isVisible: versionHistoryPanelVisible } = versionHistoryStore;
|
||||
const { hotkeyPanelVisible } = auth.settingsStore;
|
||||
|
||||
return {
|
||||
preparationPortalDialogVisible,
|
||||
sharingPanelVisible,
|
||||
uploadPanelVisible,
|
||||
ownerPanelVisible,
|
||||
|
@ -139,7 +139,6 @@ class NavMenu extends React.Component {
|
||||
asideContent,
|
||||
history,
|
||||
isDesktop,
|
||||
preparationPortalDialogVisible,
|
||||
isFrame,
|
||||
showHeader,
|
||||
} = this.props;
|
||||
@ -188,7 +187,6 @@ class NavMenu extends React.Component {
|
||||
{asideContent}
|
||||
</Aside>
|
||||
)}
|
||||
{preparationPortalDialogVisible && <PreparationPortalDialog />}
|
||||
</StyledContainer>
|
||||
)}
|
||||
</LayoutContextConsumer>
|
||||
@ -220,16 +218,16 @@ NavMenu.defaultProps = {
|
||||
isDesktop: false,
|
||||
};
|
||||
|
||||
const NavMenuWrapper = inject(({ auth, backup }) => {
|
||||
const NavMenuWrapper = inject(({ auth }) => {
|
||||
const { settingsStore, isAuthenticated, isLoaded, language } = auth;
|
||||
const { isDesktopClient: isDesktop, frameConfig, isFrame } = settingsStore;
|
||||
const { preparationPortalDialogVisible } = backup;
|
||||
|
||||
return {
|
||||
isAuthenticated,
|
||||
isLoaded,
|
||||
isDesktop,
|
||||
language,
|
||||
preparationPortalDialogVisible,
|
||||
|
||||
showHeader: frameConfig?.showHeader,
|
||||
isFrame,
|
||||
};
|
||||
|
@ -15,10 +15,9 @@ const PreparationPortalDialog = (props) => {
|
||||
isLoading={!tReady}
|
||||
visible={preparationPortalVisible}
|
||||
onClose={onClose}
|
||||
contentHeight="388px"
|
||||
contentWidth="520px"
|
||||
displayType="modal"
|
||||
withoutCloseButton
|
||||
isLarge
|
||||
>
|
||||
<ModalDialog.Header>{t("PortalRestoring")}</ModalDialog.Header>
|
||||
<ModalDialog.Body>
|
||||
|
Loading…
Reference in New Issue
Block a user