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

Web: Doceditor/Client: fixed share settings request (ssr)

Browse Source
This commit is contained in:
Artem Tarasov 2022-07-25 14:52:18 +03:00
parent 57fb7ca7e1
commit 9dcff71504
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
products/ASC.Files/Client/src/components/panels/SharingDialog/index.js
View File

@ -55,7 +55,10 @@ const SharingDialogWrapper = inject(({ dialogsStore, filesStore }) => {
})(observer(SharingDialog));
class SharingModal extends React.Component {
static getSharingSettings = (fileId) => {
static getSharingSettings = (fileId, sharingSettings = null) => {
if (sharingSettings)
return Promise.resolve(SharingPanel.convertSharingUsers(sharingSettings));
return getShareFiles([+fileId], []).then((users) =>
SharingPanel.convertSharingUsers(users)
);

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

@ -29,7 +29,7 @@ const withDialogs = (WrappedComponent) => {
const { t } = useTranslation(["Editor", "Common"]);
const { config, fileId, mfReady } = props;
const { config, fileId, mfReady, sharingSettings } = props;
const { file: fileInfo } = config;
useEffect(() => {
@ -60,7 +60,7 @@ const withDialogs = (WrappedComponent) => {
};
const loadUsersRightsList = () => {
window.SharingDialog.getSharingSettings(fileId).then(
window.SharingDialog.getSharingSettings(fileId, sharingSettings).then(
(sharingSettings) => {
window.docEditor.setSharingSettings({
sharingSettings,

8
web/ASC.Web.Editor/src/server/lib/helpers/index.js
View File

@ -5,7 +5,11 @@ import { getUser } from "@appserver/common/api/people";
import { getSettings } from "@appserver/common/api/settings";
import combineUrl from "@appserver/common/utils/combineUrl";
import { AppServerConfig } from "@appserver/common/constants";
import { openEdit, getSettingsFiles } from "@appserver/common/api/files";
import {
openEdit,
getSettingsFiles,
getShareFiles,
} from "@appserver/common/api/files";
import pkg from "../../../../package.json";
export const getFavicon = (documentType) => {
@ -77,6 +81,7 @@ export const initDocEditor = async (req) => {
const config = await openEdit(fileId, fileVersion, doc, view);
const sharingSettings = await getShareFiles([+fileId], []);
const isSharingAccess = config?.file && config?.file?.canShare;
if (view) {
@ -98,6 +103,7 @@ export const initDocEditor = async (req) => {
fileId,
view,
filesSettings,
sharingSettings,
};
} catch (err) {
error = { errorMessage: typeof err === "string" ? err : err.message };