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

Web: Doceditor: removed PreparePortalDialog and added a call to docEditor.showMessage when the portal is being restored

Browse Source
This commit is contained in:
Artem Tarasov 2022-07-25 17:57:44 +03:00
parent eb352fd860
commit d50a932443
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/ASC.Web.Editor/src/client/components/Editor.js
View File

@ -78,7 +78,6 @@ function Editor({
isDesktopEditor, isDesktopEditor,
initDesktop, initDesktop,
view, view,
preparationPortalDialog,
mfReady, mfReady,
...rest ...rest
}) { }) {
@ -567,7 +566,6 @@ function Editor({
{sharingDialog} {sharingDialog}
{selectFileDialog} {selectFileDialog}
{selectFolderDialog} {selectFolderDialog}
{preparationPortalDialog}
<Toast /> <Toast />
</EditorWrapper> </EditorWrapper>
); );

23
web/ASC.Web.Editor/src/client/helpers/withDialogs.js
View File

@ -1,7 +1,5 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import DynamicComponent from "../components/DynamicComponent";
import { getPresignedUri } from "@appserver/common/api/files"; import { getPresignedUri } from "@appserver/common/api/files";
import { STUDIO_SCOPE, STUDIO_REMOTE_ENTRY_URL } from "./constants";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import SharingDialog from "../components/SharingDialog"; import SharingDialog from "../components/SharingDialog";
import SelectFileDialog from "../components/SelectFileDialog"; import SelectFileDialog from "../components/SelectFileDialog";
@ -22,10 +20,6 @@ const withDialogs = (WrappedComponent) => {
const [urlSelectorFolder, setUrlSelectorFolder] = useState(""); const [urlSelectorFolder, setUrlSelectorFolder] = useState("");
const [extension, setExtension] = useState(); const [extension, setExtension] = useState();
const [openNewTab, setNewOpenTab] = useState(false); const [openNewTab, setNewOpenTab] = useState(false);
const [
preparationPortalDialogVisible,
setPreparationPortalDialogVisible,
] = useState(false);
const { t } = useTranslation(["Editor", "Common"]); const { t } = useTranslation(["Editor", "Common"]);
@ -47,7 +41,8 @@ const withDialogs = (WrappedComponent) => {
data: "backup-restore", data: "backup-restore",
}); });
socketHelper.on("restore-backup", () => { socketHelper.on("restore-backup", () => {
setPreparationPortalDialogVisible(true); const message = t("Common:PreparationPortalTitle");
window.docEditor.showMessage(message);
}); });
}; };
@ -197,7 +192,7 @@ const withDialogs = (WrappedComponent) => {
if (savingInfo) { if (savingInfo) {
const convertedInfo = savingInfo.split(": ").pop(); const convertedInfo = savingInfo.split(": ").pop();
docEditor.showMessage(convertedInfo); window.docEditor.showMessage(convertedInfo);
} }
}; };
@ -268,17 +263,6 @@ const withDialogs = (WrappedComponent) => {
/> />
); );
const preparationPortalDialog = mfReady && preparationPortalDialogVisible && (
<DynamicComponent
system={{
scope: STUDIO_SCOPE,
url: STUDIO_REMOTE_ENTRY_URL,
module: "./PreparationPortalDialog",
}}
visible={preparationPortalDialogVisible}
/>
);
return ( return (
<WrappedComponent <WrappedComponent
{...props} {...props}
@ -294,7 +278,6 @@ const withDialogs = (WrappedComponent) => {
selectFolderDialog={selectFolderDialog} selectFolderDialog={selectFolderDialog}
onSDKRequestSaveAs={onSDKRequestSaveAs} onSDKRequestSaveAs={onSDKRequestSaveAs}
isFolderDialogVisible={isFolderDialogVisible} isFolderDialogVisible={isFolderDialogVisible}
preparationPortalDialog={preparationPortalDialog}
/> />
); );
}; };