Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0

packages/client/src/store/CreateEditRoomStore.js

@@ -203,7 +203,9 @@ class CreateEditRoomStore {
               ? [bufferSelection]
               : [];
 
-        preparingDataForCopyingToRoom(room.id, selections, t);
+        preparingDataForCopyingToRoom(room.id, selections, t).catch((error) =>
+          toastr.error(error),
+        );
       }
 
       this.roomIsCreated = true;

packages/client/src/store/FilesActionsStore.js

@@ -2666,7 +2666,7 @@ class FilesActionStore {
       content: oneFolder,
     };
 
-    this.uploadDataStore.itemOperationToFolder(operationData);
+    return this.uploadDataStore.itemOperationToFolder(operationData);
   };
 
   onLeaveRoom = (t, isOwner = false) => {

packages/client/src/store/PublicRoomStore.js

@@ -207,8 +207,11 @@ class PublicRoomStore {
       .then((res) => {
         if (res?.shared) {
           const filter = FilesFilter.getDefault();
+          const subFolder = new URLSearchParams(window.location.search).get(
+            "folder",
+          );
           const url = getCategoryUrl(CategoryType.Shared);
-          filter.folder = res.id;
+          filter.folder = subFolder ? subFolder : res.id;
 
           return window.location.replace(`${url}?${filter.toUrlParams()}`);
         }

packages/client/src/store/UploadDataStore.js

@@ -1647,7 +1647,6 @@ class UploadDataStore {
           .then(() =>
             this.moveToCopyTo(destFolderId, pbData, true, fileIds, folderIds),
           )
-          .catch((error) => toastr.error(error))
           .finally(async () => {
             //to update the status of trashIsEmpty filesStore
             if (this.treeFoldersStore.isRecycleBinFolder)

packages/doceditor/public/locales/en/CompletedForm.json

@@ -1,6 +1,6 @@
 {
   "Title": "The form is completed",
-  "Description": "Your PDF form has been saved in the Complete section.",
+  "Description": "Your form completed and saved",
   "FillItOutAgain": "Fill it out again",
   "GoToCompleteFolder": "Go to Complete folder"
 }