From e25c59fb097e4be61cf692f4c19da6ddd35d1ef0 Mon Sep 17 00:00:00 2001
From: AlexeySafronov <alexey.safronov@onlyoffice.com>
Date: Fri, 9 Oct 2020 18:11:02 +0300
Subject: [PATCH 01/12] Web: Files: Changed initialization of DocsAPI

---
 products/ASC.Files/Client/public/index.html   |  4 --
 .../src/components/pages/DocEditor/index.js   | 44 +++++++++++++------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/products/ASC.Files/Client/public/index.html b/products/ASC.Files/Client/public/index.html
index 92fe5f6a69..1154fc00aa 100644
--- a/products/ASC.Files/Client/public/index.html
+++ b/products/ASC.Files/Client/public/index.html
@@ -26,10 +26,6 @@
       rel="stylesheet"
       type="text/css"
     />
-    <script
-      type="text/javascript"
-      src="/ds-vpath/web-apps/apps/api/documents/api.js"
-    ></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
index 1157d4bf44..4fdffc9838 100644
--- a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
+++ b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
@@ -15,28 +15,46 @@ const { changeLanguage, getObjectByLocation, hideLoader, showLoader } = utils;
 const { files } = api;
 
 class PureEditor extends React.Component {
-  componentDidMount() {
+  async componentDidMount() {
     const urlParams = getObjectByLocation(window.location);
     const fileId = urlParams.fileId || null;
 
+    console.log("PureEditor componentDidMount", fileId);
+
     const vh = window.innerHeight * 0.01;
     document.documentElement.style.setProperty("--vh", `${vh}px`);
 
     showLoader();
 
-    files
-      .openEdit(fileId)
-      .then((config) => {
-        if (window.innerWidth < 720) {
-          config.type = "mobile";
-        }
+    const docApiUrl = `${window.location.origin}/ds-vpath/web-apps/apps/api/documents/api.js`; //TODO: Change to API response -> await files.getDocServiceUrl();
 
-        window.DocsAPI.DocEditor("editor", config);
-      })
-      .catch((e) => {
-        console.log(e);
-        hideLoader();
-      });
+    const script = document.createElement("script");
+    script.setAttribute("type", "text/javascript");
+    script.setAttribute("id", "scripDocServiceAddress");
+
+    script.onload = function () {
+      console.log("PureEditor script.onload", fileId, window.DocsAPI);
+
+      files
+        .openEdit(fileId)
+        .then((config) => {
+          // if (window.innerWidth < 720) {
+          //   config.type = "mobile";
+          // }
+
+          window.DocsAPI.DocEditor("editor", config);
+        })
+        .catch((e) => {
+          console.log(e);
+          hideLoader();
+        });
+    };
+
+    script.src = docApiUrl;
+    script.async = true;
+
+    console.log("PureEditor componentDidMount: added script");
+    document.body.appendChild(script);
   }
 
   render() {

From f4ed52d985234da687e064f33a1740bee526a9bc Mon Sep 17 00:00:00 2001
From: AlexeySafronov <alexey.safronov@onlyoffice.com>
Date: Fri, 9 Oct 2020 19:06:50 +0300
Subject: [PATCH 02/12] Web: Added and applied new API method getDocServiceUrl

---
 web/ASC.Web.Common/src/api/files/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/ASC.Web.Common/src/api/files/index.js b/web/ASC.Web.Common/src/api/files/index.js
index 32c760e2cb..410c75bb25 100644
--- a/web/ASC.Web.Common/src/api/files/index.js
+++ b/web/ASC.Web.Common/src/api/files/index.js
@@ -463,3 +463,7 @@ export function thirdParty(val) {
 export function getSettingsFiles() {
   return request({ method: "get", url: `/files/settings` });
 }
+
+export function getDocServiceUrl() {
+  return request({ method: "get", url: `/files/docservice` });
+}

From 3afd5deddac5218db77ec7860d760b757792767d Mon Sep 17 00:00:00 2001
From: AlexeySafronov <alexey.safronov@onlyoffice.com>
Date: Fri, 9 Oct 2020 19:07:10 +0300
Subject: [PATCH 03/12] web: common: bump version

---
 web/ASC.Web.Common/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Common/package.json b/web/ASC.Web.Common/package.json
index 13c9477a2b..f8e4530aa9 100644
--- a/web/ASC.Web.Common/package.json
+++ b/web/ASC.Web.Common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-common",
-  "version": "1.0.251",
+  "version": "1.0.252",
   "description": "Ascensio System SIA common components and solutions library",
   "license": "AGPL-3.0",
   "files": [

From ee6307e2889bafd1297e0ce32bd610b0ca8260e5 Mon Sep 17 00:00:00 2001
From: AlexeySafronov <alexey.safronov@onlyoffice.com>
Date: Fri, 9 Oct 2020 19:14:48 +0300
Subject: [PATCH 04/12] Web: People: Added hack for build machine only

---
 .../src/components/pages/DocEditor/index.js      | 16 ++++++++++++++--
 products/ASC.Files/Client/yarn.lock              |  4 ++--
 products/ASC.People/Client/yarn.lock             |  4 ++--
 web/ASC.Web.Client/yarn.lock                     |  4 ++--
 web/ASC.Web.Common/yarn.lock                     |  2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
index 4fdffc9838..d2bea07b1d 100644
--- a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
+++ b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { withRouter } from "react-router";
 import { /*RequestLoader,*/ Box } from "asc-web-components";
-import { utils, api } from "asc-web-common";
+import { utils, api, toastr } from "asc-web-common";
 import { withTranslation, I18nextProvider } from "react-i18next";
 import { createI18N } from "../../../helpers/i18n";
 const i18n = createI18N({
@@ -26,7 +26,16 @@ class PureEditor extends React.Component {
 
     showLoader();
 
-    const docApiUrl = `${window.location.origin}/ds-vpath/web-apps/apps/api/documents/api.js`; //TODO: Change to API response -> await files.getDocServiceUrl();
+    let docApiUrl = await files.getDocServiceUrl();
+
+    if (window.location.origin === "https://dotnet.onlyoffice.com:8093") {
+      const tempDevUrl =
+        "https://dotnet.onlyoffice.com/ds-vpath/web-apps/apps/api/documents/api.js";
+      console.log(
+        `Replace url to DocAPI from '${docApiUrl}' to '${tempDevUrl}'`
+      );
+      docApiUrl = tempDevUrl;
+    }
 
     const script = document.createElement("script");
     script.setAttribute("type", "text/javascript");
@@ -41,11 +50,14 @@ class PureEditor extends React.Component {
           // if (window.innerWidth < 720) {
           //   config.type = "mobile";
           // }
+          if (!window.DocsAPI) throw new Error("DocsAPI is not defined");
 
+          console.log("Trying to open file with DocsAPI", fileId);
           window.DocsAPI.DocEditor("editor", config);
         })
         .catch((e) => {
           console.log(e);
+          toastr.error(e);
           hideLoader();
         });
     };
diff --git a/products/ASC.Files/Client/yarn.lock b/products/ASC.Files/Client/yarn.lock
index aec4595ed3..ae928c6939 100644
--- a/products/ASC.Files/Client/yarn.lock
+++ b/products/ASC.Files/Client/yarn.lock
@@ -2178,7 +2178,7 @@ asap@~2.0.6:
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 "asc-web-common@file:../../../packages/asc-web-common":
-  version "1.0.250"
+  version "1.0.252"
   dependencies:
     axios "^0.19.1"
     history "4.10.1"
@@ -2193,7 +2193,7 @@ asap@~2.0.6:
     sjcl "^1.0.8"
 
 "asc-web-components@file:../../../packages/asc-web-components":
-  version "1.0.459"
+  version "1.0.460"
   dependencies:
     email-addresses "^3.1.0"
     html-to-react "^1.4.2"
diff --git a/products/ASC.People/Client/yarn.lock b/products/ASC.People/Client/yarn.lock
index 35f51c9eef..540d8186d9 100644
--- a/products/ASC.People/Client/yarn.lock
+++ b/products/ASC.People/Client/yarn.lock
@@ -2171,7 +2171,7 @@ asap@~2.0.6:
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 "asc-web-common@file:../../../packages/asc-web-common":
-  version "1.0.250"
+  version "1.0.252"
   dependencies:
     axios "^0.19.1"
     history "4.10.1"
@@ -2186,7 +2186,7 @@ asap@~2.0.6:
     sjcl "^1.0.8"
 
 "asc-web-components@file:../../../packages/asc-web-components":
-  version "1.0.459"
+  version "1.0.460"
   dependencies:
     email-addresses "^3.1.0"
     html-to-react "^1.4.2"
diff --git a/web/ASC.Web.Client/yarn.lock b/web/ASC.Web.Client/yarn.lock
index cb51b2a356..3c755dad4e 100644
--- a/web/ASC.Web.Client/yarn.lock
+++ b/web/ASC.Web.Client/yarn.lock
@@ -2171,7 +2171,7 @@ asap@~2.0.6:
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 "asc-web-common@file:../../packages/asc-web-common":
-  version "1.0.250"
+  version "1.0.252"
   dependencies:
     axios "^0.19.1"
     history "4.10.1"
@@ -2186,7 +2186,7 @@ asap@~2.0.6:
     sjcl "^1.0.8"
 
 "asc-web-components@file:../../packages/asc-web-components":
-  version "1.0.459"
+  version "1.0.460"
   dependencies:
     email-addresses "^3.1.0"
     html-to-react "^1.4.2"
diff --git a/web/ASC.Web.Common/yarn.lock b/web/ASC.Web.Common/yarn.lock
index a717452aee..b78aad9730 100644
--- a/web/ASC.Web.Common/yarn.lock
+++ b/web/ASC.Web.Common/yarn.lock
@@ -3122,7 +3122,7 @@ arrify@^1.0.1:
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 "asc-web-components@file:../../packages/asc-web-components":
-  version "1.0.459"
+  version "1.0.460"
   dependencies:
     email-addresses "^3.1.0"
     html-to-react "^1.4.2"

From 4759f8c90bc7d08e9b5c0d8d385892ec1cfa8094 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Fri, 9 Oct 2020 20:26:25 +0300
Subject: [PATCH 05/12] Config: internal path

---
 config/appsettings.test.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/appsettings.test.json b/config/appsettings.test.json
index d673cd835f..f13bb1e193 100644
--- a/config/appsettings.test.json
+++ b/config/appsettings.test.json
@@ -31,10 +31,10 @@
 				"header": "AuthorizationJwt"
 			},
 			"url": {
-				"public" : "https://dotnet.onlyoffice.com:8093",
-				"internal" : "",
-				"portal" : "https://dotnet.onlyoffice.com:8093",
-				"converter" : "https://dotnet.onlyoffice.com/ds-vpath/ConvertService.ashx",
+				"public": "/ds-vpath/",
+				"internal": "http://172.18.0.4/",
+				"portal": "http://localhost:8093/",
+				"converter" : "/ds-vpath/ConvertService.ashx",
 			}
 		}
   }

From 26ac508aefaf9a8d3dd9a254001aab2c119e92aa Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Fri, 9 Oct 2020 20:41:26 +0300
Subject: [PATCH 06/12] Config: internal path

---
 config/appsettings.test.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/appsettings.test.json b/config/appsettings.test.json
index f13bb1e193..deada28f4b 100644
--- a/config/appsettings.test.json
+++ b/config/appsettings.test.json
@@ -33,7 +33,7 @@
 			"url": {
 				"public": "/ds-vpath/",
 				"internal": "http://172.18.0.4/",
-				"portal": "http://localhost:8093/",
+				"portal": "http://localhost:8092/",
 				"converter" : "/ds-vpath/ConvertService.ashx",
 			}
 		}

From 9c7e9794947f8b646a9f995a204e426b7ceee7b6 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Fri, 9 Oct 2020 20:59:56 +0300
Subject: [PATCH 07/12] Config: internal path

---
 config/appsettings.test.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/appsettings.test.json b/config/appsettings.test.json
index deada28f4b..aa20db4cac 100644
--- a/config/appsettings.test.json
+++ b/config/appsettings.test.json
@@ -33,7 +33,7 @@
 			"url": {
 				"public": "/ds-vpath/",
 				"internal": "http://172.18.0.4/",
-				"portal": "http://localhost:8092/",
+				"portal": "https://dotnet.onlyoffice.com:8093/",
 				"converter" : "/ds-vpath/ConvertService.ashx",
 			}
 		}

From 15f4b38a030be90ce24e7a93154f91c637bbc9d3 Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Fri, 9 Oct 2020 21:39:34 +0300
Subject: [PATCH 08/12] Web: Files: Remove hack

---
 .../Client/src/components/pages/DocEditor/index.js       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
index d2bea07b1d..74c3e4fc94 100644
--- a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
+++ b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js
@@ -28,15 +28,6 @@ class PureEditor extends React.Component {
 
     let docApiUrl = await files.getDocServiceUrl();
 
-    if (window.location.origin === "https://dotnet.onlyoffice.com:8093") {
-      const tempDevUrl =
-        "https://dotnet.onlyoffice.com/ds-vpath/web-apps/apps/api/documents/api.js";
-      console.log(
-        `Replace url to DocAPI from '${docApiUrl}' to '${tempDevUrl}'`
-      );
-      docApiUrl = tempDevUrl;
-    }
-
     const script = document.createElement("script");
     script.setAttribute("type", "text/javascript");
     script.setAttribute("id", "scripDocServiceAddress");

From bd822fedd000e329566ff42df152fbfdcd74a457 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Fri, 9 Oct 2020 22:40:06 +0300
Subject: [PATCH 09/12] ds-vpath rewrite

---
 config/nginx/onlyoffice.conf | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf
index 0c48d7f919..b62573684c 100644
--- a/config/nginx/onlyoffice.conf
+++ b/config/nginx/onlyoffice.conf
@@ -53,6 +53,26 @@ server {
 	fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 	fastcgi_param PATH_INFO "";
 		
+	location ~* ^/ds-vpath/ {
+			rewrite /ds-vpath/(.*) /$1  break;
+
+			proxy_pass http://172.18.0.4:80; //temp
+			proxy_redirect     off;
+
+			client_max_body_size 100m;
+
+			proxy_http_version 1.1;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "upgrade";
+
+			proxy_set_header Host $http_host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Forwarded-Host $the_host/ds-vpath;
+			proxy_set_header X-Forwarded-Proto $the_scheme;
+
+	}
+
 	location / {
 		proxy_pass http://localhost:5001;
 		

From 344acefa9b3ae7c2ccfefeba15a9ce43fb9137e6 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 12 Oct 2020 11:26:15 +0300
Subject: [PATCH 10/12] Files: fix filter

---
 products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
index bf83831a1d..64d6f45d76 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -243,7 +243,7 @@ namespace ASC.Files.Core.Data
                 q = GetFolderQuery()
                     .AsNoTracking()
                     .Join(FilesDbContext.Tree, r => r.Id, a => a.FolderId, (folder, tree) => new { folder, tree })
-                    .Where(r => folderIds.Any(q => q == r.folder.ParentId))
+                    .Where(r => folderIds.Any(q => q == r.tree.ParentId))
                     .Select(r => r.folder);
             }
 

From 679413c7b1a6269d1c721df2223c785d32200993 Mon Sep 17 00:00:00 2001
From: Artem Tarasov <artem.tarasov@onlyoffice.com>
Date: Mon, 12 Oct 2020 12:01:27 +0300
Subject: [PATCH 11/12] Web: Client: wizard: fixed layout

---
 web/ASC.Web.Client/src/components/pages/Wizard/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/index.js b/web/ASC.Web.Client/src/components/pages/Wizard/index.js
index bddecfcfc3..f720b00876 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/index.js
@@ -49,7 +49,7 @@ emailSettings.allowDomainPunycode = true;
 const WizardContainer = styled.div`
   width: 960px;
   margin: 0 auto;
-  margin-top: 120px;
+  margin-top: 60px;
 
   .wizard-form {
     margin-top: 32px;
@@ -65,7 +65,7 @@ const WizardContainer = styled.div`
 
   @media (max-width: 520px) {
     width: calc(100% - 32px);
-    margin-top: 72px;
+    margin-top: 12px;
   }
 `;
 

From a3f36c27963ac767d7b1189c9020552773d29233 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 12 Oct 2020 12:22:23 +0300
Subject: [PATCH 12/12] Nginx: fix

---
 config/nginx/onlyoffice.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf
index b62573684c..5123a121b0 100644
--- a/config/nginx/onlyoffice.conf
+++ b/config/nginx/onlyoffice.conf
@@ -56,7 +56,7 @@ server {
 	location ~* ^/ds-vpath/ {
 			rewrite /ds-vpath/(.*) /$1  break;
 
-			proxy_pass http://172.18.0.4:80; //temp
+			proxy_pass http://172.18.0.4:80;
 			proxy_redirect     off;
 
 			client_max_body_size 100m;