Editor: return sharing dialog
This commit is contained in:
parent
09e556b2b8
commit
2a933ee364
@ -75,14 +75,14 @@ function Editor({
|
||||
config,
|
||||
//personal,
|
||||
successAuth,
|
||||
// isSharingAccess,
|
||||
isSharingAccess,
|
||||
user,
|
||||
doc,
|
||||
error,
|
||||
// sharingDialog,
|
||||
// onSDKRequestSharingSettings,
|
||||
// loadUsersRightsList,
|
||||
// isVisible,
|
||||
sharingDialog,
|
||||
onSDKRequestSharingSettings,
|
||||
loadUsersRightsList,
|
||||
isVisible,
|
||||
selectFileDialog,
|
||||
onSDKRequestInsertImage,
|
||||
onSDKRequestMailMergeRecipients,
|
||||
@ -505,9 +505,9 @@ function Editor({
|
||||
|
||||
config?.errorMessage && docEditor?.showMessage(config.errorMessage);
|
||||
|
||||
// if (isSharingAccess) {
|
||||
// loadUsersRightsList(docEditor);
|
||||
// }
|
||||
if (isSharingAccess) {
|
||||
loadUsersRightsList(docEditor);
|
||||
}
|
||||
|
||||
assign(window, ["ASC", "Files", "Editor", "docEditor"], docEditor); //Do not remove: it's for Back button on Mobile App
|
||||
};
|
||||
@ -742,7 +742,7 @@ function Editor({
|
||||
};
|
||||
}
|
||||
|
||||
let //onRequestSharingSettings,
|
||||
let onRequestSharingSettings,
|
||||
onRequestRename,
|
||||
onRequestSaveAs,
|
||||
onRequestInsertImage,
|
||||
@ -782,9 +782,9 @@ function Editor({
|
||||
}
|
||||
}
|
||||
|
||||
// if (isSharingAccess) {
|
||||
// onRequestSharingSettings = onSDKRequestSharingSettings;
|
||||
// }
|
||||
if (isSharingAccess) {
|
||||
onRequestSharingSettings = onSDKRequestSharingSettings;
|
||||
}
|
||||
|
||||
if (userAccessRights.Rename) {
|
||||
onRequestRename = onSDKRequestRename;
|
||||
@ -831,7 +831,7 @@ function Editor({
|
||||
onInfo: onSDKInfo,
|
||||
onWarning: onSDKWarning,
|
||||
onError: onSDKError,
|
||||
// onRequestSharingSettings,
|
||||
onRequestSharingSettings,
|
||||
onRequestRename,
|
||||
onMakeActionLink: onMakeActionLink,
|
||||
onRequestInsertImage,
|
||||
@ -871,7 +871,7 @@ function Editor({
|
||||
/>
|
||||
) : (
|
||||
<>
|
||||
{/* {sharingDialog} */}
|
||||
{sharingDialog}
|
||||
{selectFileDialog}
|
||||
{selectFolderDialog}
|
||||
</>
|
||||
@ -890,9 +890,7 @@ function Editor({
|
||||
);
|
||||
|
||||
return (
|
||||
<EditorWrapper
|
||||
// isVisibleSharingDialog={isVisible}
|
||||
>
|
||||
<EditorWrapper isVisibleSharingDialog={isVisible}>
|
||||
{newConfig && (
|
||||
<DocumentEditor
|
||||
id={EDITOR_ID}
|
||||
|
@ -6,7 +6,7 @@ import {
|
||||
FilterType,
|
||||
} from "@docspace/common/constants";
|
||||
import { useTranslation } from "react-i18next";
|
||||
//import SharingDialog from "../components/SharingDialog";
|
||||
import SharingDialog from "../components/SharingDialog";
|
||||
import SelectFileDialog from "../components/SelectFileDialog";
|
||||
import SelectFolderDialog from "../components/SelectFolderDialog";
|
||||
|
||||
@ -16,7 +16,7 @@ const compareFilesAction = "documentsFileType";
|
||||
|
||||
const withDialogs = (WrappedComponent) => {
|
||||
return (props) => {
|
||||
//const [isVisible, setIsVisible] = useState(false);
|
||||
const [isVisible, setIsVisible] = useState(false);
|
||||
const [filesType, setFilesType] = useState("");
|
||||
const [isFileDialogVisible, setIsFileDialogVisible] = useState(false);
|
||||
const [typeInsertImageAction, setTypeInsertImageAction] = useState();
|
||||
@ -27,12 +27,7 @@ const withDialogs = (WrappedComponent) => {
|
||||
|
||||
const { t } = useTranslation(["Editor", "Common"]);
|
||||
|
||||
const {
|
||||
config,
|
||||
fileId,
|
||||
mfReady,
|
||||
//sharingSettings
|
||||
} = props;
|
||||
const { config, fileId, mfReady, sharingSettings } = props;
|
||||
const fileInfo = config?.file;
|
||||
|
||||
useEffect(() => {
|
||||
@ -59,23 +54,23 @@ const withDialogs = (WrappedComponent) => {
|
||||
});
|
||||
};
|
||||
|
||||
// const onSDKRequestSharingSettings = () => {
|
||||
// setIsVisible(true);
|
||||
// };
|
||||
const onSDKRequestSharingSettings = () => {
|
||||
setIsVisible(true);
|
||||
};
|
||||
|
||||
// const onCancel = () => {
|
||||
// setIsVisible(false);
|
||||
// };
|
||||
const onCancel = () => {
|
||||
setIsVisible(false);
|
||||
};
|
||||
|
||||
// const loadUsersRightsList = (docEditor) => {
|
||||
// window.SharingDialog.convertSharingUsers(sharingSettings).then(
|
||||
// (sharingSettings) => {
|
||||
// docEditor.setSharingSettings({
|
||||
// sharingSettings,
|
||||
// });
|
||||
// }
|
||||
// );
|
||||
// };
|
||||
const loadUsersRightsList = (docEditor) => {
|
||||
window.SharingDialog.convertSharingUsers(sharingSettings).then(
|
||||
(sharingSettings) => {
|
||||
docEditor.setSharingSettings({
|
||||
sharingSettings,
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
const onCloseFileDialog = () => {
|
||||
setIsFileDialogVisible(false);
|
||||
@ -242,16 +237,16 @@ const withDialogs = (WrappedComponent) => {
|
||||
}
|
||||
};
|
||||
|
||||
// const sharingDialog = (
|
||||
// <SharingDialog
|
||||
// mfReady={mfReady}
|
||||
// isVisible={isVisible}
|
||||
// fileInfo={fileInfo}
|
||||
// onCancel={onCancel}
|
||||
// loadUsersRightsList={loadUsersRightsList}
|
||||
// filesSettings={props.filesSettings}
|
||||
// />
|
||||
// );
|
||||
const sharingDialog = (
|
||||
<SharingDialog
|
||||
mfReady={mfReady}
|
||||
isVisible={isVisible}
|
||||
fileInfo={fileInfo}
|
||||
onCancel={onCancel}
|
||||
loadUsersRightsList={loadUsersRightsList}
|
||||
filesSettings={props.filesSettings}
|
||||
/>
|
||||
);
|
||||
|
||||
const selectFileDialog = (
|
||||
<SelectFileDialog
|
||||
@ -281,10 +276,10 @@ const withDialogs = (WrappedComponent) => {
|
||||
return (
|
||||
<WrappedComponent
|
||||
{...props}
|
||||
//sharingDialog={sharingDialog}
|
||||
// onSDKRequestSharingSettings={onSDKRequestSharingSettings}
|
||||
// loadUsersRightsList={loadUsersRightsList}
|
||||
//isVisible={isVisible}
|
||||
sharingDialog={sharingDialog}
|
||||
onSDKRequestSharingSettings={onSDKRequestSharingSettings}
|
||||
loadUsersRightsList={loadUsersRightsList}
|
||||
isVisible={isVisible}
|
||||
selectFileDialog={selectFileDialog}
|
||||
onSDKRequestInsertImage={onSDKRequestInsertImage}
|
||||
onSDKRequestMailMergeRecipients={onSDKRequestMailMergeRecipients}
|
||||
|
@ -105,7 +105,7 @@ export const initDocEditor = async (req) => {
|
||||
|
||||
//const sharingSettings = await getShareFiles([+fileId], []);
|
||||
|
||||
// const isSharingAccess = false; //TODO: temporary disable sharing (many errors). Restore => config?.file && config?.file?.canShare;
|
||||
const isSharingAccess = config?.file?.canShare;
|
||||
|
||||
if (view) {
|
||||
config.editorConfig.mode = "view";
|
||||
@ -164,7 +164,7 @@ export const initDocEditor = async (req) => {
|
||||
successAuth,
|
||||
user,
|
||||
error,
|
||||
//isSharingAccess,
|
||||
isSharingAccess,
|
||||
url,
|
||||
doc,
|
||||
fileId,
|
||||
|
Loading…
Reference in New Issue
Block a user