Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0

packages/asc-web-common/api/client.js

@@ -66,7 +66,7 @@ export const request = function (options) {
     if (response.data.hasOwnProperty("total"))
       return { total: +response.data.total, items: response.data.response };
 
-    return response.data.response;
+    return response.data.response || response.data;
   };
 
   const onError = function (error) {

products/ASC.Files/Client/src/helpers/utils.js

@@ -76,6 +76,20 @@ export const openDocEditor = async (
   return Promise.resolve();
 };
 
+export const getDataSaveAs = async (params) => {
+  try {
+    const data = await request({
+      baseURL: combineUrl(AppServerConfig.proxyURL, config.homepage),
+      method: "get",
+      url: `/httphandlers/filehandler.ashx?${params}`,
+      responseType: "text",
+    });
+
+    return data;
+  } catch (e) {
+    console.error("error");
+  }
+};
 export const SaveAs = (title, url, folderId, openNewTab) => {
   const options = {
     action: "create",
@@ -84,23 +98,20 @@ export const SaveAs = (title, url, folderId, openNewTab) => {
     folderid: folderId,
     response: openNewTab ? null : "message",
   };
+
   const params = toUrlParams(options, true);
-  !openNewTab
-    ? request({
-        baseURL: combineUrl(AppServerConfig.proxyURL, config.homepage),
-        method: "get",
-        url: `/httphandlers/filehandler.ashx?${params}`,
-      })
-        .then((data) => console.log("data", data))
-        .catch((e) => console.error("error", e))
-    : window.open(
-        combineUrl(
-          AppServerConfig.proxyURL,
-          config.homepage,
-          `/httphandlers/filehandler.ashx?${params}`
-        ),
-        "_blank"
-      );
+  if (!openNewTab) {
+    return getDataSaveAs(params);
+  } else {
+    window.open(
+      combineUrl(
+        AppServerConfig.proxyURL,
+        config.homepage,
+        `/httphandlers/filehandler.ashx?${params}`
+      ),
+      "_blank"
+    );
+  }
 };
 
 export const canConvert = (fileExst) => {

web/ASC.Web.Editor/src/Editor.jsx

@@ -637,6 +637,19 @@ const Editor = () => {
     setNewOpenTab(false);
   };
 
+  const getSavingInfo = async (title, folderId) => {
+    const savingInfo = await SaveAs(
+      title,
+      urlSelectorFolder,
+      folderId,
+      openNewTab
+    );
+
+    if (savingInfo) {
+      const convertedInfo = savingInfo.split(": ").pop();
+      docEditor.showMessage(convertedInfo);
+    }
+  };
   const onClickSaveSelectFolder = (e, folderId) => {
     const currentExst = titleSelectorFolder.split(".").pop();
 
@@ -645,7 +658,11 @@ const Editor = () => {
         ? titleSelectorFolder.concat(`.${extension}`)
         : titleSelectorFolder;
 
-    SaveAs(title, urlSelectorFolder, folderId, openNewTab);
+    if (openNewTab) {
+      SaveAs(title, urlSelectorFolder, folderId, openNewTab);
+    } else {
+      getSavingInfo(title, folderId);
+    }
   };
 
   const onChangeInput = (e) => {