Web: Common/Doceditor: fixed request of build version and custom scheme
This commit is contained in:
parent
e701def2d7
commit
64305a3c2c
@ -217,7 +217,12 @@ class SettingsStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
getCurrentCustomSchema = async (id) => {
|
getCurrentCustomSchema = async (id) => {
|
||||||
this.customNames = await api.settings.getCurrentCustomSchema(id);
|
let customNames = null;
|
||||||
|
if (window[`${EDITOR_STATE_NAME}`]?.customNames) {
|
||||||
|
customNames = window[`${EDITOR_STATE_NAME}`].customNames;
|
||||||
|
window[`${EDITOR_STATE_NAME}`].customNames = null;
|
||||||
|
} else customNames = await api.settings.getCurrentCustomSchema(id);
|
||||||
|
this.customNames = customNames;
|
||||||
};
|
};
|
||||||
|
|
||||||
getCustomSchemaList = async () => {
|
getCustomSchemaList = async () => {
|
||||||
@ -432,7 +437,10 @@ class SettingsStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getBuildVersionInfo = async () => {
|
getBuildVersionInfo = async () => {
|
||||||
const versionInfo = await api.settings.getBuildVersion();
|
let versionInfo = null;
|
||||||
|
if (window[`${EDITOR_STATE_NAME}`]?.versionInfo)
|
||||||
|
versionInfo = window[`${EDITOR_STATE_NAME}`].versionInfo;
|
||||||
|
else versionInfo = await api.settings.getBuildVersion();
|
||||||
this.setBuildVersionInfo(versionInfo);
|
this.setBuildVersionInfo(versionInfo);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ function Editor({
|
|||||||
mfReady,
|
mfReady,
|
||||||
...rest
|
...rest
|
||||||
}) {
|
}) {
|
||||||
const [fileInfo, setFileInfo] = useState(config.file);
|
const [fileInfo, setFileInfo] = useState(config?.file);
|
||||||
const [url, setUrl] = useState(rest.url);
|
const [url, setUrl] = useState(rest.url);
|
||||||
const [fileId, setFileId] = useState(rest.fileId);
|
const [fileId, setFileId] = useState(rest.fileId);
|
||||||
const [version, setVersion] = useState(rest.version);
|
const [version, setVersion] = useState(rest.version);
|
||||||
|
@ -30,7 +30,7 @@ const withDialogs = (WrappedComponent) => {
|
|||||||
const { t } = useTranslation(["Editor", "Common"]);
|
const { t } = useTranslation(["Editor", "Common"]);
|
||||||
|
|
||||||
const { config, fileId, mfReady, sharingSettings } = props;
|
const { config, fileId, mfReady, sharingSettings } = props;
|
||||||
const { file: fileInfo } = config;
|
const fileInfo = config?.file;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (window.authStore) {
|
if (window.authStore) {
|
||||||
|
@ -2,7 +2,11 @@ import path from "path";
|
|||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import { initSSR } from "@appserver/common/api/client";
|
import { initSSR } from "@appserver/common/api/client";
|
||||||
import { getUser } from "@appserver/common/api/people";
|
import { getUser } from "@appserver/common/api/people";
|
||||||
import { getSettings } from "@appserver/common/api/settings";
|
import {
|
||||||
|
getSettings,
|
||||||
|
getBuildVersion,
|
||||||
|
getCurrentCustomSchema,
|
||||||
|
} from "@appserver/common/api/settings";
|
||||||
import combineUrl from "@appserver/common/utils/combineUrl";
|
import combineUrl from "@appserver/common/utils/combineUrl";
|
||||||
import { AppServerConfig } from "@appserver/common/constants";
|
import { AppServerConfig } from "@appserver/common/constants";
|
||||||
import {
|
import {
|
||||||
@ -59,10 +63,18 @@ export const initDocEditor = async (req) => {
|
|||||||
const view = url.indexOf("action=view") !== -1;
|
const view = url.indexOf("action=view") !== -1;
|
||||||
const fileVersion = version || null;
|
const fileVersion = version || null;
|
||||||
|
|
||||||
const [user, settings, filesSettings] = await Promise.all([
|
const [
|
||||||
|
user,
|
||||||
|
settings,
|
||||||
|
filesSettings,
|
||||||
|
versionInfo,
|
||||||
|
customNames,
|
||||||
|
] = await Promise.all([
|
||||||
getUser(),
|
getUser(),
|
||||||
getSettings(),
|
getSettings(),
|
||||||
getSettingsFiles(),
|
getSettingsFiles(),
|
||||||
|
getBuildVersion(),
|
||||||
|
getCurrentCustomSchema("Common"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const successAuth = !!user;
|
const successAuth = !!user;
|
||||||
@ -82,6 +94,7 @@ export const initDocEditor = async (req) => {
|
|||||||
const config = await openEdit(fileId, fileVersion, doc, view);
|
const config = await openEdit(fileId, fileVersion, doc, view);
|
||||||
|
|
||||||
const sharingSettings = await getShareFiles([+fileId], []);
|
const sharingSettings = await getShareFiles([+fileId], []);
|
||||||
|
|
||||||
const isSharingAccess = config?.file && config?.file?.canShare;
|
const isSharingAccess = config?.file && config?.file?.canShare;
|
||||||
|
|
||||||
if (view) {
|
if (view) {
|
||||||
@ -105,6 +118,8 @@ export const initDocEditor = async (req) => {
|
|||||||
filesSettings,
|
filesSettings,
|
||||||
sharingSettings,
|
sharingSettings,
|
||||||
portalSettings: settings,
|
portalSettings: settings,
|
||||||
|
versionInfo,
|
||||||
|
customNames,
|
||||||
};
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
error = { errorMessage: typeof err === "string" ? err : err.message };
|
error = { errorMessage: typeof err === "string" ? err : err.message };
|
||||||
|
@ -12,7 +12,7 @@ export default function template(
|
|||||||
) {
|
) {
|
||||||
const { title } = pkg;
|
const { title } = pkg;
|
||||||
const { error } = initialEditorState;
|
const { error } = initialEditorState;
|
||||||
const { editorUrl } = initialEditorState?.config;
|
const editorUrl = initialEditorState?.config?.editorUrl;
|
||||||
const faviconHref = getFavicon(initialEditorState?.config?.documentType);
|
const faviconHref = getFavicon(initialEditorState?.config?.documentType);
|
||||||
|
|
||||||
let clientScripts =
|
let clientScripts =
|
||||||
|
Loading…
Reference in New Issue
Block a user