Merge branch 'release/v1.1.0' into feature/translate-1.1.0

products/ASC.Files/Client/public/locales/en/Translations.json

@@ -41,9 +41,9 @@
   "TypeTitleSkyDrive": "OneDrive",
   "TypeTitleWebDav": "WebDAV",
   "TypeTitleYandex": "Yandex.Disk",
-  "NewForm": "Master form",
-  "NewFormFile": "Master form from file",
-  "CreateMasterFormFromFile": "Create Master Form from file",
-  "SubNewForm": "From blank",
-  "SubNewFormFile": "From an existing text file"
+  "NewForm": "Form template",
+  "NewFormFile": "Form from text file",
+  "CreateMasterFormFromFile": "Create Form Template from file",
+  "SubNewForm": "Blank",
+  "SubNewFormFile": "From text file"
 }

products/ASC.Files/Client/src/components/Article/MainButton/index.js

@@ -109,9 +109,9 @@ class ArticleMainButtonContent extends React.Component {
                 className: "main-button_drop-down_sub",
                 label: t("Translations:SubNewFormFile"),
                 onClick: this.onShowSelectFileDialog,
+                disabled: isPrivacy,
               },
             ],
-            disabled: isPrivacy,
           },
         ]
       : [
@@ -121,7 +121,6 @@ class ArticleMainButtonContent extends React.Component {
             label: t("Translations:NewForm"),
             onClick: this.onCreate,
             action: "docxf",
-            disabled: isPrivacy,
           },
           {
             className: "main-button_drop-down_sub",

products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js

@@ -130,12 +130,12 @@ const DownloadContent = (props) => {
               {title}
             </Text>
             <></>
-            <Text fontSize="12px" containerWidth="auto">
+            <Text fontSize="12px" containerMinWidth="fit-content">
               {(checkedTitle || indeterminateTitle) && t("ConvertInto")}
             </Text>
             {checkedTitle || indeterminateTitle ? (
               <LinkWithDropdown
-                containerWidth="auto"
+                containerMinWidth="fit-content"
                 data={titleData}
                 directionX="left"
                 directionY="bottom"
@@ -181,7 +181,11 @@ const DownloadContent = (props) => {
                 </Text>
                 <></>
                 {file.checked && (
-                  <Text fontSize="12px" containerWidth="auto" noSelect>
+                  <Text
+                    fontSize="12px"
+                    containerMinWidth="fit-content"
+                    noSelect
+                  >
                     {t("ConvertInto")}
                   </Text>
                 )}
@@ -191,7 +195,7 @@ const DownloadContent = (props) => {
                     dropdownType={
                       isMobile ? "alwaysDashed" : "appearDashedAfterHover"
                     }
-                    containerWidth="auto"
+                    containerMinWidth="fit-content"
                     data={dropdownItems}
                     directionX="left"
                     directionY="bottom"

products/ASC.Files/Client/src/components/dialogs/ModalDialogContainer.js

@@ -3,6 +3,10 @@ import { tablet } from "@appserver/components/utils/device";
 import ModalDialog from "@appserver/components/modal-dialog";
 
 const ModalDialogContainer = styled(ModalDialog)`
+  .row-main-container-wrapper {
+    width: 100%;
+  }
+
   .flex {
     display: flex;
     justify-content: space-between;

products/ASC.Files/Client/src/pages/Home/Section/Header/index.js

@@ -186,7 +186,7 @@ class SectionHeaderContent extends React.Component {
   uploadToFolder = () => console.log("Upload To Folder click");
 
   getContextOptionsPlus = () => {
-    const { t } = this.props;
+    const { t, isPrivacyFolder } = this.props;
 
     return [
       {
@@ -211,6 +211,7 @@ class SectionHeaderContent extends React.Component {
       {
         label: t("Translations:NewFormFile"),
         onClick: this.createFormFromFile,
+        disabled: isPrivacyFolder,
       },
       {
         key: "new-folder",
@@ -540,7 +541,7 @@ export default inject(
       setSelectFileDialogVisible,
     } = dialogsStore;
 
-    const { isRecycleBinFolder } = treeFoldersStore;
+    const { isRecycleBinFolder, isPrivacyFolder } = treeFoldersStore;
     const { deleteAction, downloadAction, getHeaderMenu } = filesActionsStore;
 
     return {
@@ -578,6 +579,7 @@ export default inject(
       isRecycleBinFolder,
       setEmptyTrashDialogVisible,
       isEmptyFilesList,
+      isPrivacyFolder,
     };
   }
 )(

products/ASC.Files/Client/src/store/DialogsStore.js

@@ -180,9 +180,13 @@ class DialogsStore {
     const { createFile, fetchFiles, filter } = this.filesStore;
     const { id } = this.selectedFolderStore;
     let newTitle = fileInfo.title;
+    const templateId =
+      typeof fileInfo.id === "string"
+        ? encodeURIComponent(fileInfo.id)
+        : fileInfo.id;
     newTitle = newTitle.substring(0, newTitle.lastIndexOf("."));
 
-    createFile(id, `${newTitle}.docxf`, fileInfo.id)
+    createFile(id, `${newTitle}.docxf`, templateId)
       .then(() => fetchFiles(id, filter, true, true))
       .catch((err) => console.error(err));
   };

products/ASC.Files/Client/src/store/FilesStore.js

@@ -605,6 +605,7 @@ class FilesStore {
         fileOptions = this.removeOptions(fileOptions, [
           "open",
           "edit",
+          "make-form",
           "link-for-portal-users",
           "external-link",
           "send-by-email",