Web: Doceditor: fixed api requests

web/ASC.Web.Editor/src/client/App.js

@@ -32,7 +32,8 @@ const App = ({ initialLanguage, initialI18nStoreASC, ...rest }) => {
 
   useEffect(() => {
     const tempElm = document.getElementById("loader");
-    if (tempElm && !rest.error && !rest.needLoader && rest.docApiUrl) {
+
+    if (tempElm && !rest.error && !rest.needLoader && rest?.config?.editorUrl) {
       tempElm.outerHTML = "";
     }
 
@@ -42,7 +43,6 @@ const App = ({ initialLanguage, initialI18nStoreASC, ...rest }) => {
   }, []);
 
   const onError = () => {
-    console.log("Error");
     window.open(
       combineUrl(
         AppServerConfig.proxyURL,

web/ASC.Web.Editor/src/client/components/Editor.js

@@ -82,7 +82,7 @@ function Editor({
   mfReady,
   ...rest
 }) {
-  const [fileInfo, setFileInfo] = useState(rest.fileInfo);
+  const [fileInfo, setFileInfo] = useState(config.file);
   const [url, setUrl] = useState(rest.url);
   const [fileId, setFileId] = useState(rest.fileId);
   const [version, setVersion] = useState(rest.version);

web/ASC.Web.Editor/src/client/helpers/withDialogs.js

@@ -29,7 +29,8 @@ const withDialogs = (WrappedComponent) => {
 
     const { t } = useTranslation(["Editor", "Common"]);
 
-    const { fileInfo, fileId, mfReady } = props;
+    const { config, fileId, mfReady } = props;
+    const { file: fileInfo } = config;
 
     useEffect(() => {
       if (window.authStore) {

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

@@ -5,12 +5,7 @@ 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 {
-  getDocServiceUrl,
-  getFileInfo,
-  openEdit,
-  getSettingsFiles,
-} from "@appserver/common/api/files";
+import { openEdit, getSettingsFiles } from "@appserver/common/api/files";
 import pkg from "../../../../package.json";
 
 export const getFavicon = (documentType) => {
@@ -80,13 +75,9 @@ export const initDocEditor = async (req) => {
       return { error };
     }
 
-    let [config, docApiUrl, fileInfo] = await Promise.all([
-      openEdit(fileId, fileVersion, doc, view),
-      getDocServiceUrl(),
-      getFileInfo(fileId),
-    ]);
+    const config = await openEdit(fileId, fileVersion, doc, view);
 
-    const isSharingAccess = fileInfo && fileInfo.canShare;
+    const isSharingAccess = config?.file && config?.file?.canShare;
 
     if (view) {
       config.editorConfig.mode = "view";
@@ -95,8 +86,6 @@ export const initDocEditor = async (req) => {
     const actionLink = config?.editorConfig?.actionLink || null;
 
     return {
-      fileInfo,
-      docApiUrl,
       config,
       personal,
       successAuth,

web/ASC.Web.Editor/src/server/lib/template.js

@@ -10,8 +10,8 @@ export default function template(
   assets
 ) {
   const { title } = pkg;
-  const { docApiUrl, error } = initialEditorState;
-
+  const { error } = initialEditorState;
+  const { editorUrl } = initialEditorState?.config;
   const faviconHref = getFavicon(initialEditorState?.config?.documentType);
 
   let clientScripts =
@@ -20,9 +20,9 @@ export default function template(
       : "";
 
   const editorApiScript =
-    error || !docApiUrl
+    error || !editorUrl
       ? ""
-      : `<script type='text/javascript' id='scripDocServiceAddress' src="${docApiUrl}" async></script>`;
+      : `<script type='text/javascript' id='scripDocServiceAddress' src="${editorUrl}" async></script>`;
 
   if (!IS_DEVELOPMENT) {
     const productionBundleKeys = getScripts(assets);