ONLYOFFICE · AlexeySafronov · Jan 24, 2022 · Dec 8, 2021 · Dec 21, 2021 · Dec 21, 2021
diff --git a/packages/asc-web-common/api/files/index.js b/packages/asc-web-common/api/files/index.js
@@ -550,8 +550,8 @@ export function getNewFiles(folderId) {
   });
 }
 
-export function convertFile(fileId, sync = false) {
-  const data = { sync };
+export function convertFile(fileId, password = null, sync = false) {
+  const data = { password, sync };
 
   return request({
     method: "put",
@@ -800,14 +800,21 @@ export function checkFillFormDraft(fileId) {
   });
 }
 
-export function fileCopyAs(fileId, destTitle, destFolderId, enableExternalExt) {
+export function fileCopyAs(
+  fileId,
+  destTitle,
+  destFolderId,
+  enableExternalExt,
+  password
+) {
   return request({
     method: "post",
     url: `files/file/${fileId}/copyas`,
     data: {
       destTitle,
       destFolderId,
       enableExternalExt,
+      password,
     },
   });
 }

diff --git a/packages/asc-web-components/input-block/index.js b/packages/asc-web-components/input-block/index.js
@@ -57,6 +57,7 @@ class InputBlock extends React.Component {
       onIconClick,
       iconSize,
       theme,
+      forwardedRef,
     } = this.props;
 
     if (typeof iconSize == "number" && iconSize > 0) {
@@ -118,6 +119,7 @@ class InputBlock extends React.Component {
           withBorder={false}
           mask={mask}
           keepCharPositions={keepCharPositions}
+          forwardedRef={forwardedRef}
         />
         {
           //iconNames.includes(iconName) && (

diff --git a/packages/asc-web-components/input-block/styled-input-block.js b/packages/asc-web-components/input-block/styled-input-block.js
@@ -47,8 +47,12 @@ const StyledInputGroup = styled(CustomInputGroup)`
     margin: ${(props) => props.theme.inputBlock.margin};
   }
 
-  ${commonInputStyle} :focus-within {
-    border-color: ${(props) => props.theme.inputBlock.borderColor};
+  ${commonInputStyle}
+
+  :focus-within {
+    border-color: ${(props) =>
+      (props.hasError && props.theme.input.focusErrorBorderColor) ||
+      props.theme.inputBlock.borderColor};
   }
 `;
 StyledInputGroup.defaultProps = { theme: Base };

diff --git a/products/ASC.Files/Client/public/locales/bg/Translations.json b/products/ASC.Files/Client/public/locales/bg/Translations.json
@@ -1,49 +1,50 @@
 {
-    "AddAccount": "Добави профил",
-    "ArchivingData": "Архивиране на данни",
-    "ConnectingAccount": "Свързване на профил",
-    "Copy": "Копирай",
-    "CopyOperation": "Копиране",
-    "DeleteFromTrash": "Избраните елементи бяха успешно изтрити от Кошчето",
-    "DeleteOperation": "Изтриване",
-    "DeleteSelectedElem": "Избраните елементи бяха успешно изтрити",
-    "DeleteThirdParty": "Изтрий трето лице",
-    "DownloadApps": "Изтегли приложенията",
-    "DownloadAs": "Изтегли като",
-    "EncryptedFileSaving": "Запазване на криптиран файл",
-    "Files": "Файлове",
-    "Folders": "Папки",
-    "FolderSelection": "Избор на папка",
-    "FolderTitleBoxNet": "Box директория",
-    "FolderTitleDocuSign": "DocuSign профил",
-    "FolderTitleDropBox": "Dropbox директория",
-    "FolderTitleGoogle": "Google директория",
-    "FolderTitlekDrive": "kDrive директория",
-    "FolderTitleSharePoint": "SharePoint директория",
-    "FolderTitleSkyDrive": "OneDrive директория",
-    "FolderTitleWebDav": "WebDAV директория",
-    "FolderTitleYandex": "Yandex директория",
-    "LinkCopySuccess": "Връзката беше копирана в клипборда",
-    "MediaLoadError": "Медийният файл не може да бъде зареден",
-    "Move": "Премести",
-    "MoveToOperation": "Преместване",
-    "OwnerChange": "Смени собственик",
-    "Presentations": "Презентации",
-    "Restore": "Възстанови",
-    "Spreadsheets": "Таблици",
-    "ThirdPartyInfo": "Смени информацията от трето лице",
-    "TypeTitleBoxNet": "Box",
-    "TypeTitleDocuSign": "DocuSign",
-    "TypeTitleDropBox": "Dropbox",
-    "TypeTitleGoogle": "Google Drive",
-    "TypeTitlekDrive": "kDrive",
-    "TypeTitleSharePoint": "SharePoint",
-    "TypeTitleSkyDrive": "OneDrive",
-    "TypeTitleWebDav": "WebDAV",
-    "TypeTitleYandex": "Yandex.Disk",
-    "NewForm": "Шаблон на формуляр",
-    "NewFormFile": "Шаблон от файл",
-    "CreateMasterFormFromFile": "Създай шаблон на формуляр от файл",
-    "SubNewForm": "Празен",
-    "SubNewFormFile": "От текстов файл"
-}
+  "AddAccount": "Добави профил",
+  "ArchivingData": "Архивиране на данни",
+  "ConnectingAccount": "Свързване на профил",
+  "Copy": "Копирай",
+  "CopyOperation": "Копиране",
+  "DeleteFromTrash": "Избраните елементи бяха успешно изтрити от Кошчето",
+  "DeleteOperation": "Изтриване",
+  "DeleteSelectedElem": "Избраните елементи бяха успешно изтрити",
+  "DeleteThirdParty": "Изтрий трето лице",
+  "DownloadApps": "Изтегли приложенията",
+  "DownloadAs": "Изтегли като",
+  "EncryptedFileSaving": "Запазване на криптиран файл",
+  "Files": "Файлове",
+  "FileProtected": "Файлът е защитен с парола",
+  "Folders": "Папки",
+  "FolderSelection": "Избор на папка",
+  "FolderTitleBoxNet": "Box директория",
+  "FolderTitleDocuSign": "DocuSign профил",
+  "FolderTitleDropBox": "Dropbox директория",
+  "FolderTitleGoogle": "Google директория",
+  "FolderTitlekDrive": "kDrive директория",
+  "FolderTitleSharePoint": "SharePoint директория",
+  "FolderTitleSkyDrive": "OneDrive директория",
+  "FolderTitleWebDav": "WebDAV директория",
+  "FolderTitleYandex": "Yandex директория",
+  "LinkCopySuccess": "Връзката беше копирана в клипборда",
+  "MediaLoadError": "Медийният файл не може да бъде зареден",
+  "Move": "Премести",
+  "MoveToOperation": "Преместване",
+  "OwnerChange": "Смени собственик",
+  "Presentations": "Презентации",
+  "Restore": "Възстанови",
+  "Spreadsheets": "Таблици",
+  "ThirdPartyInfo": "Смени информацията от трето лице",
+  "TypeTitleBoxNet": "Box",
+  "TypeTitleDocuSign": "DocuSign",
+  "TypeTitleDropBox": "Dropbox",
+  "TypeTitleGoogle": "Google Drive",
+  "TypeTitlekDrive": "kDrive",
+  "TypeTitleSharePoint": "SharePoint",
+  "TypeTitleSkyDrive": "OneDrive",
+  "TypeTitleWebDav": "WebDAV",
+  "TypeTitleYandex": "Yandex.Disk",
+  "NewForm": "Шаблон на формуляр",
+  "NewFormFile": "Шаблон от файл",
+  "CreateMasterFormFromFile": "Създай шаблон на формуляр от файл",
+  "SubNewForm": "Празен",
+  "SubNewFormFile": "От текстов файл"
+}
diff --git a/products/ASC.Files/Client/public/locales/de/Translations.json b/products/ASC.Files/Client/public/locales/de/Translations.json
@@ -1,49 +1,50 @@
 {
-    "AddAccount": "Konto hinzufügen",
-    "ArchivingData": "Archivieren der Daten",
-    "ConnectingAccount": "Konto wird verbunden",
-    "Copy": "Kopieren",
-    "CopyOperation": "Kopieren",
-    "DeleteFromTrash": "Die ausgewählten Elemente wurden aus dem Papierkorb gelöscht",
-    "DeleteOperation": "Löschen",
-    "DeleteSelectedElem": "Die ausgewählten Elemente wurden gelöscht",
-    "DeleteThirdParty": "Drittanbieterdienst deaktivieren",
-    "DownloadApps": "Apps herunterladen",
-    "DownloadAs": "Herunterladen als",
-    "EncryptedFileSaving": "Die verschlüsselte Datei wird gespeichert",
-    "Files": "Dateien",
-    "Folders": "Ordner",
-    "FolderSelection": "Ordnerauswahl",
-    "FolderTitleBoxNet": "Box-Verzeichnis",
-    "FolderTitleDocuSign": "DocuSign Konto",
-    "FolderTitleDropBox": "Dropbox-Verzeichnis",
-    "FolderTitleGoogle": "Google-Verzeichnis",
-    "FolderTitlekDrive": "kDrive Verzeichnis",
-    "FolderTitleSharePoint": "SharePoint-Verzeichnis",
-    "FolderTitleSkyDrive": "OneDrive-Verzeichnis",
-    "FolderTitleWebDav": "WebDAV Verzeichnis",
-    "FolderTitleYandex": "Yandex Verzeichnis",
-    "LinkCopySuccess": "Der Link wurde in die Zwischenablage kopiert",
-    "MediaLoadError": "Die Mediendatei konnte nicht geladen werden",
-    "Move": "Verschieben",
-    "MoveToOperation": "Wird verschoben",
-    "OwnerChange": "Besitzer ändern",
-    "Presentations": "Präsentationen",
-    "Restore": "Wiederherstellen",
-    "Spreadsheets": "Tabellenkalkulationen",
-    "ThirdPartyInfo": "Ändern Sie die Drittanbieterinformationen",
-    "TypeTitleBoxNet": "Box",
-    "TypeTitleDocuSign": "DocuSign",
-    "TypeTitleDropBox": "Dropbox",
-    "TypeTitleGoogle": "Google Drive",
-    "TypeTitlekDrive": "kDrive",
-    "TypeTitleSharePoint": "SharePoint",
-    "TypeTitleSkyDrive": "OneDrive",
-    "TypeTitleWebDav": "WebDAV",
-    "TypeTitleYandex": "Yandex.Disk",
-    "NewForm": "Formularvorlage",
-    "NewFormFile": "Formular aus Textdatei",
-    "CreateMasterFormFromFile": "Formularvorlage aus Datei erstellen",
-    "SubNewForm": "Leer",
-    "SubNewFormFile": "Aus Textdatei"
+  "AddAccount": "Konto hinzufügen",
+  "ArchivingData": "Archivieren der Daten",
+  "ConnectingAccount": "Konto wird verbunden",
+  "Copy": "Kopieren",
+  "CopyOperation": "Kopieren",
+  "DeleteFromTrash": "Die ausgewählten Elemente wurden aus dem Papierkorb gelöscht",
+  "DeleteOperation": "Löschen",
+  "DeleteSelectedElem": "Die ausgewählten Elemente wurden gelöscht",
+  "DeleteThirdParty": "Drittanbieterdienst deaktivieren",
+  "DownloadApps": "Apps herunterladen",
+  "DownloadAs": "Herunterladen als",
+  "EncryptedFileSaving": "Die verschlüsselte Datei wird gespeichert",
+  "Files": "Dateien",
+  "FileProtected": "Diese Datei ist kennwortgeschützt",
+  "Folders": "Ordner",
+  "FolderSelection": "Ordnerauswahl",
+  "FolderTitleBoxNet": "Box-Verzeichnis",
+  "FolderTitleDocuSign": "DocuSign Konto",
+  "FolderTitleDropBox": "Dropbox-Verzeichnis",
+  "FolderTitleGoogle": "Google-Verzeichnis",
+  "FolderTitlekDrive": "kDrive Verzeichnis",
+  "FolderTitleSharePoint": "SharePoint-Verzeichnis",
+  "FolderTitleSkyDrive": "OneDrive-Verzeichnis",
+  "FolderTitleWebDav": "WebDAV Verzeichnis",
+  "FolderTitleYandex": "Yandex Verzeichnis",
+  "LinkCopySuccess": "Der Link wurde in die Zwischenablage kopiert",
+  "MediaLoadError": "Die Mediendatei konnte nicht geladen werden",
+  "Move": "Verschieben",
+  "MoveToOperation": "Wird verschoben",
+  "OwnerChange": "Besitzer ändern",
+  "Presentations": "Präsentationen",
+  "Restore": "Wiederherstellen",
+  "Spreadsheets": "Tabellenkalkulationen",
+  "ThirdPartyInfo": "Ändern Sie die Drittanbieterinformationen",
+  "TypeTitleBoxNet": "Box",
+  "TypeTitleDocuSign": "DocuSign",
+  "TypeTitleDropBox": "Dropbox",
+  "TypeTitleGoogle": "Google Drive",
+  "TypeTitlekDrive": "kDrive",
+  "TypeTitleSharePoint": "SharePoint",
+  "TypeTitleSkyDrive": "OneDrive",
+  "TypeTitleWebDav": "WebDAV",
+  "TypeTitleYandex": "Yandex.Disk",
+  "NewForm": "Formularvorlage",
+  "NewFormFile": "Formular aus Textdatei",
+  "CreateMasterFormFromFile": "Formularvorlage aus Datei erstellen",
+  "SubNewForm": "Leer",
+  "SubNewFormFile": "Aus Textdatei"
 }
diff --git a/products/ASC.Files/Client/public/locales/en/ConvertPasswordDialog.json b/products/ASC.Files/Client/public/locales/en/ConvertPasswordDialog.json
@@ -0,0 +1,6 @@
+{
+  "SuccessfullyCreated": "File '{{fileTitle}}' created",
+  "ConversionPasswordFormCaption": "Enter a password to save the template",
+  "ConversionPasswordMasterFormCaption": "Enter a password to save as oform",
+  "CreationError": "File creation error. The wrong password was entered"
+}
diff --git a/products/ASC.Files/Client/public/locales/en/Translations.json b/products/ASC.Files/Client/public/locales/en/Translations.json
@@ -12,6 +12,7 @@
   "DownloadAs": "Download as",
   "EncryptedFileSaving": "Saving encrypted file",
   "Files": "Files",
+  "FileProtected": "The file is password protected",
   "Folders": "Folders",
   "FolderSelection": "Folder selection",
   "FolderTitleBoxNet": "Box directory",

diff --git a/products/ASC.Files/Client/public/locales/en/UploadPanel.json b/products/ASC.Files/Client/public/locales/en/UploadPanel.json
@@ -1,3 +1,8 @@
 {
-  "Uploads": "Uploads"
-}
+  "Uploads": "Uploads",
+  "EnterPassword": "Enter password",
+  "HideInput": "Hide",
+  "Ready": "Done",
+  "UploadAndConvert": "Upload and convert files",
+  "Conversion": "Convert  files"
+}
diff --git a/products/ASC.Files/Client/public/locales/fr/Translations.json b/products/ASC.Files/Client/public/locales/fr/Translations.json
@@ -1,49 +1,50 @@
 {
-    "AddAccount": "Ajouter un compte",
-    "ArchivingData": "Archivage des données",
-    "ConnectingAccount": "Connecter un compte",
-    "Copy": "Copier",
-    "CopyOperation": "copier",
-    "DeleteFromTrash": "Les éléments sélectionnés ont été supprimés avec succès de la corbeille",
-    "DeleteOperation": "Suppression",
-    "DeleteSelectedElem": "Les éléments sélectionnés ont été supprimés avec succès",
-    "DeleteThirdParty": "Supprimer un tiers",
-    "DownloadApps": "Download applications",
-    "DownloadAs": "Télécharger comme",
-    "EncryptedFileSaving": "Enregistrement du fichier chiffré",
-    "Files": "Fichiers",
-    "Folders": "Dossiers",
-    "FolderSelection": "Folder selection",
-    "FolderTitleBoxNet": "Répertoire de Box",
-    "FolderTitleDocuSign": "Сompte DocuSign",
-    "FolderTitleDropBox": "Répertoire de Dropbox",
-    "FolderTitleGoogle": "Répertoire de Google",
-    "FolderTitlekDrive": "Répertoire kDrive",
-    "FolderTitleSharePoint": "Répertoire de SharePoint",
-    "FolderTitleSkyDrive": "Répertoire de OneDrive",
-    "FolderTitleWebDav": "Répertoire WebDAV",
-    "FolderTitleYandex": "WebDAV Yandex",
-    "LinkCopySuccess": "Le lien a été copié dans le Presse-papiers",
-    "MediaLoadError": "Media file could not be loaded",
-    "Move": "Déplacer",
-    "MoveToOperation": "Déplacement",
-    "OwnerChange": "Changer le propriétaire",
-    "Presentations": "Présentations",
-    "Restore": "Restaurer",
-    "Spreadsheets": "Feuilles de calcul",
-    "ThirdPartyInfo": "Modifier les informations sur les tiers",
-    "TypeTitleBoxNet": "Box",
-    "TypeTitleDocuSign": "DocuSign",
-    "TypeTitleDropBox": "Dropbox",
-    "TypeTitleGoogle": "Google Drive",
-    "TypeTitlekDrive": "kDrive",
-    "TypeTitleSharePoint": "SharePoint",
-    "TypeTitleSkyDrive": "OneDrive",
-    "TypeTitleWebDav": "WebDAV",
-    "TypeTitleYandex": "Yandex.Disk",
-    "NewForm": "Modèle de formulaire",
-    "NewFormFile": "Formulaire à partir d'un fichier texte",
-    "CreateMasterFormFromFile": "Créer un modèle de formulaire à partir d'un fichier",
-    "SubNewForm": "Blanc",
-    "SubNewFormFile": "Depuis un fichier texte"
+  "AddAccount": "Ajouter un compte",
+  "ArchivingData": "Archivage des données",
+  "ConnectingAccount": "Connecter un compte",
+  "Copy": "Copier",
+  "CopyOperation": "copier",
+  "DeleteFromTrash": "Les éléments sélectionnés ont été supprimés avec succès de la corbeille",
+  "DeleteOperation": "Suppression",
+  "DeleteSelectedElem": "Les éléments sélectionnés ont été supprimés avec succès",
+  "DeleteThirdParty": "Supprimer un tiers",
+  "DownloadApps": "Download applications",
+  "DownloadAs": "Télécharger comme",
+  "EncryptedFileSaving": "Enregistrement du fichier chiffré",
+  "Files": "Fichiers",
+  "FileProtected": "Le fichier est protégé par un mot de passe",
+  "Folders": "Dossiers",
+  "FolderSelection": "Folder selection",
+  "FolderTitleBoxNet": "Répertoire de Box",
+  "FolderTitleDocuSign": "Сompte DocuSign",
+  "FolderTitleDropBox": "Répertoire de Dropbox",
+  "FolderTitleGoogle": "Répertoire de Google",
+  "FolderTitlekDrive": "Répertoire kDrive",
+  "FolderTitleSharePoint": "Répertoire de SharePoint",
+  "FolderTitleSkyDrive": "Répertoire de OneDrive",
+  "FolderTitleWebDav": "Répertoire WebDAV",
+  "FolderTitleYandex": "WebDAV Yandex",
+  "LinkCopySuccess": "Le lien a été copié dans le Presse-papiers",
+  "MediaLoadError": "Media file could not be loaded",
+  "Move": "Déplacer",
+  "MoveToOperation": "Déplacement",
+  "OwnerChange": "Changer le propriétaire",
+  "Presentations": "Présentations",
+  "Restore": "Restaurer",
+  "Spreadsheets": "Feuilles de calcul",
+  "ThirdPartyInfo": "Modifier les informations sur les tiers",
+  "TypeTitleBoxNet": "Box",
+  "TypeTitleDocuSign": "DocuSign",
+  "TypeTitleDropBox": "Dropbox",
+  "TypeTitleGoogle": "Google Drive",
+  "TypeTitlekDrive": "kDrive",
+  "TypeTitleSharePoint": "SharePoint",
+  "TypeTitleSkyDrive": "OneDrive",
+  "TypeTitleWebDav": "WebDAV",
+  "TypeTitleYandex": "Yandex.Disk",
+  "NewForm": "Modèle de formulaire",
+  "NewFormFile": "Formulaire à partir d'un fichier texte",
+  "CreateMasterFormFromFile": "Créer un modèle de formulaire à partir d'un fichier",
+  "SubNewForm": "Blanc",
+  "SubNewFormFile": "Depuis un fichier texte"
 }