From cb60b8f87624c8c88aca326c5a04a99760a15e2a Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Wed, 4 Sep 2019 14:10:23 +0300
Subject: [PATCH 01/37] ASC.Web.Components: added tabIndex prop to date-input
 component

---
 web/ASC.Web.Components/src/components/date-input/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/ASC.Web.Components/src/components/date-input/index.js b/web/ASC.Web.Components/src/components/date-input/index.js
index 5ae9a79ec2..d375e2195f 100644
--- a/web/ASC.Web.Components/src/components/date-input/index.js
+++ b/web/ASC.Web.Components/src/components/date-input/index.js
@@ -31,6 +31,7 @@ const DateInput = props => {
             iconColor="#A3A9AE"
             onIconClick={iconClick}
             scale={true}
+            tabIndex={props.tabIndex}
           />
         }
         {...props}

From 13ac1efd97b8debcc3af2a64bd8c781865e9597b Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Wed, 4 Sep 2019 14:10:29 +0300
Subject: [PATCH 02/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 775811e77e..739f3af9ca 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From 8f7613888622e1273b43534262dacbc3483efaf6 Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Wed, 4 Sep 2019 14:12:43 +0300
Subject: [PATCH 03/37] ASC.People: ProfileAction: added tabIndex to components

---
 .../Section/Body/FormFields/DateField.js         |  4 +++-
 .../Section/Body/FormFields/DepartmentField.js   |  2 +-
 .../Section/Body/FormFields/PasswordField.js     |  8 +++++---
 .../Section/Body/FormFields/RadioField.js        |  2 +-
 .../Section/Body/FormFields/TextChangeField.js   |  6 +++++-
 .../Section/Body/FormFields/TextField.js         |  6 +++++-
 .../ProfileAction/Section/Body/createUserForm.js | 15 ++++++++++++---
 .../ProfileAction/Section/Body/updateUserForm.js | 16 +++++++++++++---
 8 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
index 6eaa17d151..7fd15068d5 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
@@ -10,7 +10,8 @@ const DateField = React.memo((props) => {
     inputName,
     inputValue,
     inputIsDisabled,
-    inputOnChange
+    inputOnChange,
+    inputTabIndex
   } = props;
 
   return (
@@ -25,6 +26,7 @@ const DateField = React.memo((props) => {
         disabled={inputIsDisabled}
         onChange={inputOnChange}
         hasError={hasError}
+        tabIndex={inputTabIndex}
       />
     </FieldContainer>
   );
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DepartmentField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DepartmentField.js
index 55ab87f01c..bc0620383a 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DepartmentField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DepartmentField.js
@@ -6,7 +6,7 @@ const DepartmentField = React.memo((props) => {
     isRequired,
     hasError,
     labelText,
-    
+
     departments,
     onRemoveDepartment
   } = props;
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
index 91c62c8c29..08c8b59a25 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
@@ -33,18 +33,19 @@ const PasswordField = React.memo((props) => {
     isRequired,
     hasError,
     labelText,
-    
+
     radioName,
     radioValue,
     radioOptions,
     radioIsDisabled,
     radioOnChange,
-    
+
     inputName,
     inputValue,
     inputIsDisabled,
     inputOnChange,
-    
+    inputTabIndex,
+
     inputIconOnClick,
     inputShowPassword,
 
@@ -80,6 +81,7 @@ const PasswordField = React.memo((props) => {
             onChange={inputOnChange}
             scale={true}
             type={inputShowPassword ? "text" : "password"}
+            tabIndex={inputTabIndex}
           />
           <Icons.RefreshIcon
             size="medium"
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
index 69d4af79ba..c37cd12e5e 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
@@ -6,7 +6,7 @@ const RadioField = React.memo((props) => {
     isRequired,
     hasError,
     labelText,
-    
+
     radioName,
     radioValue,
     radioOptions,
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
index bcc528cd43..0af98f1951 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
@@ -16,10 +16,12 @@ const TextChangeField = React.memo((props) => {
 
     inputName,
     inputValue,
+    inputTabIndex,
 
     buttonText,
     buttonIsDisabled,
-    buttonOnClick
+    buttonOnClick,
+    buttonTabIndex
   } = props;
 
   return (
@@ -34,6 +36,7 @@ const TextChangeField = React.memo((props) => {
           value={inputValue}
           isDisabled={true}
           hasError={hasError}
+          tabIndex={inputTabIndex}
         />
         <Button
           label={buttonText}
@@ -41,6 +44,7 @@ const TextChangeField = React.memo((props) => {
           isDisabled={buttonIsDisabled}
           size="medium"
           style={{ marginLeft: "8px" }}
+          tabIndex={buttonTabIndex}
         />
       </InputContainer>
     </FieldContainer>
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
index e93ed92bce..a9d914dab8 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
@@ -10,7 +10,9 @@ const TextField = React.memo((props) => {
     inputName,
     inputValue,
     inputIsDisabled,
-    inputOnChange
+    inputOnChange,
+    inputAutoFocussed,
+    inputTabIndex
   } = props;
 
   return (
@@ -26,6 +28,8 @@ const TextField = React.memo((props) => {
         onChange={inputOnChange}
         hasError={hasError}
         className="field-input"
+        isAutoFocussed={inputAutoFocussed}
+        tabIndex={inputTabIndex}
       />
     </FieldContainer>
   );
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
index 4f99585d57..88e88c5911 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
@@ -133,6 +133,8 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.firstName}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputAutoFocussed={true}
+              inputTabIndex={1}
             />
             <TextField
               isRequired={true}
@@ -142,6 +144,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.lastName}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={2}
             />
             <TextField
               isRequired={true}
@@ -151,6 +154,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.email}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={3}
             />
             <PasswordField
               isRequired={true}
@@ -173,6 +177,7 @@ class CreateUserForm extends React.Component {
               refreshIconOnClick={()=>{}}
               copyLinkText={this.props.t("CopyEmailAndPassword")}
               copyLinkOnClick={()=>{}}
+              inputTabIndex={4}
             />
             <DateField
               labelText={`${this.props.t("Birthdate")}:`}
@@ -180,6 +185,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.birthday ? new Date(this.state.profile.birthday) : undefined}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onBirthdayDateChange}
+              inputTabIndex={5}
             />
             <RadioField
               labelText={`${this.props.t("Sex")}:`}
@@ -198,6 +204,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.workFrom ? new Date(this.state.profile.workFrom) : undefined}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onWorkFromDateChange}
+              inputTabIndex={6}
             />
             <TextField
               labelText={`${this.props.t("Location")}:`}
@@ -205,6 +212,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.location}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={7}
             />
             <TextField
               labelText={`${this.props.t("CustomPosition", { position })}:`}
@@ -212,6 +220,7 @@ class CreateUserForm extends React.Component {
               inputValue={this.state.profile.title}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={8}
             />
             <DepartmentField
               labelText={`${this.props.t("CustomDepartment", { department })}:`}
@@ -222,11 +231,11 @@ class CreateUserForm extends React.Component {
         </MainContainer>
         <div>
           <Text.ContentHeader>{this.props.t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange}/> 
+          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange} tabIndex={9}/> 
         </div>
         <div style={{marginTop: "60px"}}>
-          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big"/>
-          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }}/>
+          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big" tabIndex={10}/>
+          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={11}/>
         </div>
       </>
     );
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index 4b48af633d..75b627ec9c 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -138,6 +138,7 @@ class UpdateUserForm extends React.Component {
               buttonText={this.props.t("ChangeButton")}
               buttonIsDisabled={this.state.isLoading}
               buttonOnClick={this.onDialogShow}
+              buttonTabIndex={1}
             />
             <TextChangeField
               labelText={`${this.props.t("Password")}:`}
@@ -146,6 +147,7 @@ class UpdateUserForm extends React.Component {
               buttonText={this.props.t("ChangeButton")}
               buttonIsDisabled={this.state.isLoading}
               buttonOnClick={this.onDialogShow}
+              buttonTabIndex={2}
             />
             <TextChangeField
               labelText={`${this.props.t("Phone")}:`}
@@ -154,6 +156,7 @@ class UpdateUserForm extends React.Component {
               buttonText={this.props.t("ChangeButton")}
               buttonIsDisabled={this.state.isLoading}
               buttonOnClick={this.onDialogShow}
+              buttonTabIndex={3}
             />
             <TextField
               isRequired={true}
@@ -163,6 +166,8 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.firstName}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputAutoFocussed={true}
+              inputTabIndex={4}
             />
             <TextField
               isRequired={true}
@@ -172,6 +177,7 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.lastName}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={5}
             />
             <DateField
               labelText={`${this.props.t("Birthdate")}:`}
@@ -179,6 +185,7 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.birthday ? new Date(this.state.profile.birthday) : undefined}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onBirthdayDateChange}
+              inputTabIndex={6}
             />
             <RadioField
               labelText={`${this.props.t("Sex")}:`}
@@ -208,6 +215,7 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.workFrom ? new Date(this.state.profile.workFrom) : undefined}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onWorkFromDateChange}
+              inputTabIndex={7}
             />
             <TextField
               labelText={`${this.props.t("Location")}:`}
@@ -215,6 +223,7 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.location}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={8}
             />
             <TextField
               labelText={`${this.props.t("CustomPosition", { position })}:`}
@@ -222,6 +231,7 @@ class UpdateUserForm extends React.Component {
               inputValue={this.state.profile.title}
               inputIsDisabled={this.state.isLoading}
               inputOnChange={this.onTextChange}
+              inputTabIndex={9}
             />
             <DepartmentField
               labelText={`${this.props.t("CustomDepartment", { department })}:`}
@@ -232,11 +242,11 @@ class UpdateUserForm extends React.Component {
         </MainContainer>
         <div>
           <Text.ContentHeader>{this.props.t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange}/> 
+          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange} tabIndex={10}/> 
         </div>
         <div style={{marginTop: "60px"}}>
-          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big"/>
-          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }}/>
+          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big" tabIndex={11}/>
+          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={12}/>
         </div>
 
         <ModalDialog

From e3f341c03222c1b1e9136f788bd70f8d3b61726a Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Wed, 4 Sep 2019 14:57:16 +0300
Subject: [PATCH 04/37] ASC.People: ProfileAction: added simple email
 validation

---
 .../pages/ProfileAction/Section/Body/createUserForm.js         | 3 ++-
 .../pages/ProfileAction/Section/Body/updateUserForm.js         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
index 88e88c5911..371a7f1856 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
@@ -80,10 +80,11 @@ class CreateUserForm extends React.Component {
   }
 
   validate() {
+    const emailRegex = /.+@.+\..+/;
     const errors = {
       firstName: !this.state.profile.firstName,
       lastName: !this.state.profile.lastName,
-      email: !this.state.profile.email,
+      email: !emailRegex.test(this.state.profile.email),
       password: this.state.profile.passwordType === "temp" && !this.state.profile.password
     };
     const hasError = errors.firstName || errors.lastName || errors.email || errors.password;
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index 75b627ec9c..07db77a803 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -76,10 +76,11 @@ class UpdateUserForm extends React.Component {
   }
 
   validate() {
+    const emailRegex = /.+@.+\..+/;
     const errors = {
       firstName: !this.state.profile.firstName,
       lastName: !this.state.profile.lastName,
-      email: !this.state.profile.email,
+      email: !emailRegex.test(this.state.profile.email),
       password: this.state.profile.passwordType === "temp" && !this.state.profile.password
     };
     const hasError = errors.firstName || errors.lastName || errors.email || errors.password;

From 39d332e10e68e4a7a158187102c66199bc45622c Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Wed, 4 Sep 2019 15:19:46 +0300
Subject: [PATCH 05/37] ASC.People: ProfileAction: refactoring

---
 .../Section/Body/createUserForm.js            | 113 ++++++++--------
 .../Section/Body/updateUserForm.js            | 121 +++++++++---------
 .../Client/src/store/profile/actions.js       |   1 -
 3 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
index 371a7f1856..1b809663c4 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
@@ -36,8 +36,6 @@ class CreateUserForm extends React.Component {
   }
 
   mapPropsToState = (props) => {
-    const isVisitor = props.match.params.type === "guest";
-
     return {
       isLoading: false,
       showPassword: false,
@@ -47,7 +45,10 @@ class CreateUserForm extends React.Component {
         email: false,
         password: false,
       },
-      profile: toEmployeeWrapper({ isVisitor: isVisitor})
+      profile: toEmployeeWrapper({ 
+        isVisitor: props.match.params.type === "guest",
+        passwordType: "link"
+      })
     };
   }
 
@@ -80,12 +81,13 @@ class CreateUserForm extends React.Component {
   }
 
   validate() {
+    const { profile } = this.state;
     const emailRegex = /.+@.+\..+/;
     const errors = {
-      firstName: !this.state.profile.firstName,
-      lastName: !this.state.profile.lastName,
-      email: !emailRegex.test(this.state.profile.email),
-      password: this.state.profile.passwordType === "temp" && !this.state.profile.password
+      firstName: !profile.firstName,
+      lastName: !profile.lastName,
+      email: !emailRegex.test(profile.email),
+      password: profile.passwordType === "temp" && !profile.password
     };
     const hasError = errors.firstName || errors.lastName || errors.email || errors.password;
     this.setState({errors: errors});
@@ -114,129 +116,132 @@ class CreateUserForm extends React.Component {
   }
 
   render() {
+    const { isLoading, showPassword, errors, profile } = this.state;
+    const { t } = this.props;
+
     return (
       <>
         <MainContainer>
           <AvatarContainer>
             <Avatar
               size="max"
-              role={getUserRole(this.state.profile)}
+              role={getUserRole(profile)}
               editing={true}
-              editLabel={this.props.t("AddPhoto")}
+              editLabel={t("AddPhoto")}
             />
           </AvatarContainer>
           <MainFieldsContainer>
             <TextField
               isRequired={true}
-              hasError={this.state.errors.firstName}
-              labelText={`${this.props.t("FirstName")}:`}
+              hasError={errors.firstName}
+              labelText={`${t("FirstName")}:`}
               inputName="firstName"
-              inputValue={this.state.profile.firstName}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.firstName}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputAutoFocussed={true}
               inputTabIndex={1}
             />
             <TextField
               isRequired={true}
-              hasError={this.state.errors.lastName}
-              labelText={`${this.props.t("LastName")}:`}
+              hasError={errors.lastName}
+              labelText={`${t("LastName")}:`}
               inputName="lastName"
-              inputValue={this.state.profile.lastName}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.lastName}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={2}
             />
             <TextField
               isRequired={true}
-              hasError={this.state.errors.email}
-              labelText={`${this.props.t("Email")}:`}
+              hasError={errors.email}
+              labelText={`${t("Email")}:`}
               inputName="email"
-              inputValue={this.state.profile.email}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.email}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={3}
             />
             <PasswordField
               isRequired={true}
-              hasError={this.state.errors.password}
-              labelText={`${this.props.t("Password")}:`}
+              hasError={errors.password}
+              labelText={`${t("Password")}:`}
               radioName="passwordType"
-              radioValue={this.state.profile.passwordType}
+              radioValue={profile.passwordType}
               radioOptions={[
-                { value: 'link', label: this.props.t("ActivationLink")},
-                { value: 'temp', label: this.props.t("TemporaryPassword")}
+                { value: 'link', label: t("ActivationLink")},
+                { value: 'temp', label: t("TemporaryPassword")}
               ]}
-              radioIsDisabled={this.state.isLoading}
+              radioIsDisabled={isLoading}
               radioOnChange={this.onTextChange}
               inputName="password"
-              inputValue={this.state.profile.password}
-              inputIsDisabled={this.state.isLoading || this.state.profile.passwordType === "link"}
+              inputValue={profile.password}
+              inputIsDisabled={isLoading || profile.passwordType === "link"}
               inputOnChange={this.onTextChange}
               inputIconOnClick={this.onShowPassword}
-              inputShowPassword={this.state.showPassword}
+              inputShowPassword={showPassword}
               refreshIconOnClick={()=>{}}
-              copyLinkText={this.props.t("CopyEmailAndPassword")}
+              copyLinkText={t("CopyEmailAndPassword")}
               copyLinkOnClick={()=>{}}
               inputTabIndex={4}
             />
             <DateField
-              labelText={`${this.props.t("Birthdate")}:`}
+              labelText={`${t("Birthdate")}:`}
               inputName="birthday"
-              inputValue={this.state.profile.birthday ? new Date(this.state.profile.birthday) : undefined}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.birthday ? new Date(profile.birthday) : undefined}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onBirthdayDateChange}
               inputTabIndex={5}
             />
             <RadioField
-              labelText={`${this.props.t("Sex")}:`}
+              labelText={`${t("Sex")}:`}
               radioName="sex"
-              radioValue={this.state.profile.sex}
+              radioValue={profile.sex}
               radioOptions={[
-                { value: 'male', label: this.props.t("SexMale")},
-                { value: 'female', label: this.props.t("SexFemale")}
+                { value: 'male', label: t("SexMale")},
+                { value: 'female', label: t("SexFemale")}
               ]}
-              radioIsDisabled={this.state.isLoading}
+              radioIsDisabled={isLoading}
               radioOnChange={this.onTextChange}
             />
             <DateField
-              labelText={`${this.props.t("CustomEmployedSinceDate", { employedSinceDate })}:`}
+              labelText={`${t("CustomEmployedSinceDate", { employedSinceDate })}:`}
               inputName="workFrom"
-              inputValue={this.state.profile.workFrom ? new Date(this.state.profile.workFrom) : undefined}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.workFrom ? new Date(profile.workFrom) : undefined}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onWorkFromDateChange}
               inputTabIndex={6}
             />
             <TextField
-              labelText={`${this.props.t("Location")}:`}
+              labelText={`${t("Location")}:`}
               inputName="location"
-              inputValue={this.state.profile.location}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.location}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={7}
             />
             <TextField
-              labelText={`${this.props.t("CustomPosition", { position })}:`}
+              labelText={`${t("CustomPosition", { position })}:`}
               inputName="title"
-              inputValue={this.state.profile.title}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.title}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={8}
             />
             <DepartmentField
-              labelText={`${this.props.t("CustomDepartment", { department })}:`}
-              departments={this.state.profile.groups}
+              labelText={`${t("CustomDepartment", { department })}:`}
+              departments={profile.groups}
               onRemoveDepartment={this.onGroupClose}
             />
           </MainFieldsContainer>
         </MainContainer>
         <div>
-          <Text.ContentHeader>{this.props.t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange} tabIndex={9}/> 
+          <Text.ContentHeader>{t("Comments")}</Text.ContentHeader>
+          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onTextChange} tabIndex={9}/> 
         </div>
         <div style={{marginTop: "60px"}}>
-          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big" tabIndex={10}/>
-          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={11}/>
+          <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={10}/>
+          <Button label={t("CancelButton")} onClick={this.onCancel} isDisabled={isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={11}/>
         </div>
       </>
     );
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index 07db77a803..39fbe691fe 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -44,8 +44,6 @@ class UpdateUserForm extends React.Component {
       errors: {
         firstName: false,
         lastName: false,
-        email: false,
-        password: false,
       },
       profile: toEmployeeWrapper(props.profile)
     };
@@ -76,14 +74,12 @@ class UpdateUserForm extends React.Component {
   }
 
   validate() {
-    const emailRegex = /.+@.+\..+/;
+    const { profile } = this.state;
     const errors = {
-      firstName: !this.state.profile.firstName,
-      lastName: !this.state.profile.lastName,
-      email: !emailRegex.test(this.state.profile.email),
-      password: this.state.profile.passwordType === "temp" && !this.state.profile.password
+      firstName: !profile.firstName,
+      lastName: !profile.lastName,
     };
-    const hasError = errors.firstName || errors.lastName || errors.email || errors.password;
+    const hasError = errors.firstName || errors.lastName;
     this.setState({errors: errors});
     return !hasError;
   }
@@ -118,140 +114,143 @@ class UpdateUserForm extends React.Component {
   }
 
   render() {
+    const { isLoading, isDialogVisible, errors, profile } = this.state;
+    const { t } = this.props;
+
     return (
       <>
         <MainContainer>
           <AvatarContainer>
             <Avatar
               size="max"
-              role={getUserRole(this.state.profile)}
-              source={this.state.profile.avatarMax}
-              userName={this.state.profile.displayName}
+              role={getUserRole(profile)}
+              source={profile.avatarMax}
+              userName={profile.displayName}
               editing={true}
-              editLabel={this.props.t("EditPhoto")}
+              editLabel={t("EditPhoto")}
             />
           </AvatarContainer>
           <MainFieldsContainer>
             <TextChangeField
-              labelText={`${this.props.t("Email")}:`}
+              labelText={`${t("Email")}:`}
               inputName="email"
-              inputValue={this.state.profile.email}
-              buttonText={this.props.t("ChangeButton")}
-              buttonIsDisabled={this.state.isLoading}
+              inputValue={profile.email}
+              buttonText={t("ChangeButton")}
+              buttonIsDisabled={isLoading}
               buttonOnClick={this.onDialogShow}
               buttonTabIndex={1}
             />
             <TextChangeField
-              labelText={`${this.props.t("Password")}:`}
+              labelText={`${t("Password")}:`}
               inputName="password"
-              inputValue={this.state.profile.password}
-              buttonText={this.props.t("ChangeButton")}
-              buttonIsDisabled={this.state.isLoading}
+              inputValue={profile.password}
+              buttonText={t("ChangeButton")}
+              buttonIsDisabled={isLoading}
               buttonOnClick={this.onDialogShow}
               buttonTabIndex={2}
             />
             <TextChangeField
-              labelText={`${this.props.t("Phone")}:`}
+              labelText={`${t("Phone")}:`}
               inputName="phone"
-              inputValue={this.state.profile.phone}
-              buttonText={this.props.t("ChangeButton")}
-              buttonIsDisabled={this.state.isLoading}
+              inputValue={profile.phone}
+              buttonText={t("ChangeButton")}
+              buttonIsDisabled={isLoading}
               buttonOnClick={this.onDialogShow}
               buttonTabIndex={3}
             />
             <TextField
               isRequired={true}
-              hasError={this.state.errors.firstName}
-              labelText={`${this.props.t("FirstName")}:`}
+              hasError={errors.firstName}
+              labelText={`${t("FirstName")}:`}
               inputName="firstName"
-              inputValue={this.state.profile.firstName}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.firstName}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputAutoFocussed={true}
               inputTabIndex={4}
             />
             <TextField
               isRequired={true}
-              hasError={this.state.errors.lastName}
-              labelText={`${this.props.t("LastName")}:`}
+              hasError={errors.lastName}
+              labelText={`${t("LastName")}:`}
               inputName="lastName"
-              inputValue={this.state.profile.lastName}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.lastName}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={5}
             />
             <DateField
-              labelText={`${this.props.t("Birthdate")}:`}
+              labelText={`${t("Birthdate")}:`}
               inputName="birthday"
-              inputValue={this.state.profile.birthday ? new Date(this.state.profile.birthday) : undefined}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.birthday ? new Date(profile.birthday) : undefined}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onBirthdayDateChange}
               inputTabIndex={6}
             />
             <RadioField
-              labelText={`${this.props.t("Sex")}:`}
+              labelText={`${t("Sex")}:`}
               radioName="sex"
-              radioValue={this.state.profile.sex}
+              radioValue={profile.sex}
               radioOptions={[
-                { value: 'male', label: this.props.t("SexMale")},
-                { value: 'female', label: this.props.t("SexFemale")}
+                { value: 'male', label: t("SexMale")},
+                { value: 'female', label: t("SexFemale")}
               ]}
-              radioIsDisabled={this.state.isLoading}
+              radioIsDisabled={isLoading}
               radioOnChange={this.onTextChange}
             />
             <RadioField
-              labelText={`${this.props.t("UserType")}:`}
+              labelText={`${t("UserType")}:`}
               radioName="sex"
-              radioValue={this.state.profile.isVisitor.toString()}
+              radioValue={profile.isVisitor.toString()}
               radioOptions={[
-                { value: "true", label: this.props.t("CustomTypeGuest", { typeGuest })},
-                { value: "false", label: this.props.t("CustomTypeUser", { typeUser })}
+                { value: "true", label: t("CustomTypeGuest", { typeGuest })},
+                { value: "false", label: t("CustomTypeUser", { typeUser })}
               ]}
-              radioIsDisabled={this.state.isLoading}
+              radioIsDisabled={isLoading}
               radioOnChange={this.onTextChange}
             />
             <DateField
-              labelText={`${this.props.t("CustomEmployedSinceDate", { employedSinceDate })}:`}
+              labelText={`${t("CustomEmployedSinceDate", { employedSinceDate })}:`}
               inputName="workFrom"
-              inputValue={this.state.profile.workFrom ? new Date(this.state.profile.workFrom) : undefined}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.workFrom ? new Date(profile.workFrom) : undefined}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onWorkFromDateChange}
               inputTabIndex={7}
             />
             <TextField
-              labelText={`${this.props.t("Location")}:`}
+              labelText={`${t("Location")}:`}
               inputName="location"
-              inputValue={this.state.profile.location}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.location}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={8}
             />
             <TextField
-              labelText={`${this.props.t("CustomPosition", { position })}:`}
+              labelText={`${t("CustomPosition", { position })}:`}
               inputName="title"
-              inputValue={this.state.profile.title}
-              inputIsDisabled={this.state.isLoading}
+              inputValue={profile.title}
+              inputIsDisabled={isLoading}
               inputOnChange={this.onTextChange}
               inputTabIndex={9}
             />
             <DepartmentField
-              labelText={`${this.props.t("CustomDepartment", { department })}:`}
-              departments={this.state.profile.groups}
+              labelText={`${t("CustomDepartment", { department })}:`}
+              departments={profile.groups}
               onRemoveDepartment={this.onGroupClose}
             />
           </MainFieldsContainer>
         </MainContainer>
         <div>
-          <Text.ContentHeader>{this.props.t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={this.state.profile.notes} isDisabled={this.state.isLoading} onChange={this.onTextChange} tabIndex={10}/> 
+          <Text.ContentHeader>{t("Comments")}</Text.ContentHeader>
+          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onTextChange} tabIndex={10}/> 
         </div>
         <div style={{marginTop: "60px"}}>
-          <Button label={this.props.t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={this.state.isLoading} size="big" tabIndex={11}/>
-          <Button label={this.props.t("CancelButton")} onClick={this.onCancel} isDisabled={this.state.isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={12}/>
+          <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={11}/>
+          <Button label={t("CancelButton")} onClick={this.onCancel} isDisabled={isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={12}/>
         </div>
 
         <ModalDialog
-          visible={this.state.isDialogVisible}
+          visible={isDialogVisible}
           headerContent={"Change something"}
           bodyContent={<p>Send the something instructions?</p>}
           footerContent={<Button label="Send" primary={true} onClick={this.onDialogClose} />}
diff --git a/products/ASC.People/Client/src/store/profile/actions.js b/products/ASC.People/Client/src/store/profile/actions.js
index b749410dda..a676883daa 100644
--- a/products/ASC.People/Client/src/store/profile/actions.js
+++ b/products/ASC.People/Client/src/store/profile/actions.js
@@ -42,7 +42,6 @@ export function toEmployeeWrapper(profile) {
         password: "",
         birthday: "",
         sex: "male",
-        passwordType: "link",
         workFrom: "",
         location: "",
         title: "",

From 3341b343d185a9868e2ebb4147019a5492ef7650 Mon Sep 17 00:00:00 2001
From: alexeybannov <alexey.bannov@onlyoffice.com>
Date: Wed, 4 Sep 2019 15:33:02 +0000
Subject: [PATCH 06/37] snap package: init

---
 build/install/snap/.gitignore                 |    1 +
 build/install/snap/run.sh                     |    7 +
 build/install/snap/snap/.snapcraft/state      |    4 +
 .../__pycache__/x-redis.cpython-35.pyc        |  Bin 0 -> 1031 bytes
 build/install/snap/snap/plugins/x-redis.py    |   27 +
 build/install/snap/snap/snapcraft.yaml        |  153 +++
 build/install/snap/src/hooks/bin/configure    |   10 +
 .../snap/src/hooks/utilities/hook-utilities   |   32 +
 build/install/snap/src/mysql/bin/start_mysql  |   97 ++
 build/install/snap/src/mysql/my.cnf           |    8 +
 .../src/mysql/support-files/.mysql.server.swp |  Bin 0 -> 1024 bytes
 .../snap/src/mysql/support-files/mysql.server |  315 +++++
 .../snap/src/mysql/utilities/mysql-utilities  |   72 ++
 build/install/snap/src/nginx/bin/start_nginx  |   12 +
 ...-communityserver-common-init.conf.template |   43 +
 ...e-communityserver-common-ssl.conf.template |  129 +++
 .../onlyoffice-communityserver-common.conf    |   83 ++
 ...ffice-communityserver-common.conf.template |   46 +
 ...nlyoffice-communityserver-letsencrypt.conf |    3 +
 ...office-communityserver-nginx.conf.template |   32 +
 ...server-proxy-to-controlpanel.conf.template |   36 +
 ...rver-proxy-to-documentserver.conf.template |   18 +
 .../onlyoffice-communityserver-services.conf  |   44 +
 .../config/nginx-config/conf.d/onlyoffice     |   46 +
 .../src/nginx/config/nginx-config/nginx.conf  |   30 +
 .../snap/src/nginx/utilities/nginx-utilities  |   17 +
 .../snap/src/onlyoffice/bin/start_monoserve   |   87 ++
 .../config/hyperfastcgi-config/onlyoffice     |   24 +
 .../hyperfastcgi-config/onlyofficeApiSystem   |   24 +
 .../onlyoffice/utilities/monoserve-utilities  |   36 +
 ...ompile-time-disabling-of-setpriority.patch |   92 ++
 .../snap/src/redis/bin/start-redis-server     |   12 +
 .../install/snap/src/redis/config/redis.conf  | 1023 +++++++++++++++++
 .../snap/src/redis/utilities/redis-utilities  |   35 +
 34 files changed, 2598 insertions(+)
 create mode 100644 build/install/snap/.gitignore
 create mode 100644 build/install/snap/run.sh
 create mode 100644 build/install/snap/snap/.snapcraft/state
 create mode 100644 build/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc
 create mode 100644 build/install/snap/snap/plugins/x-redis.py
 create mode 100644 build/install/snap/snap/snapcraft.yaml
 create mode 100755 build/install/snap/src/hooks/bin/configure
 create mode 100755 build/install/snap/src/hooks/utilities/hook-utilities
 create mode 100755 build/install/snap/src/mysql/bin/start_mysql
 create mode 100644 build/install/snap/src/mysql/my.cnf
 create mode 100644 build/install/snap/src/mysql/support-files/.mysql.server.swp
 create mode 100755 build/install/snap/src/mysql/support-files/mysql.server
 create mode 100755 build/install/snap/src/mysql/utilities/mysql-utilities
 create mode 100755 build/install/snap/src/nginx/bin/start_nginx
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-init.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-ssl.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-letsencrypt.conf
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-nginx.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-controlpanel.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-documentserver.conf.template
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-services.conf
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/conf.d/onlyoffice
 create mode 100644 build/install/snap/src/nginx/config/nginx-config/nginx.conf
 create mode 100755 build/install/snap/src/nginx/utilities/nginx-utilities
 create mode 100755 build/install/snap/src/onlyoffice/bin/start_monoserve
 create mode 100644 build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyoffice
 create mode 100644 build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyofficeApiSystem
 create mode 100755 build/install/snap/src/onlyoffice/utilities/monoserve-utilities
 create mode 100644 build/install/snap/src/patches/support-compile-time-disabling-of-setpriority.patch
 create mode 100755 build/install/snap/src/redis/bin/start-redis-server
 create mode 100644 build/install/snap/src/redis/config/redis.conf
 create mode 100755 build/install/snap/src/redis/utilities/redis-utilities

diff --git a/build/install/snap/.gitignore b/build/install/snap/.gitignore
new file mode 100644
index 0000000000..c0ff3025c3
--- /dev/null
+++ b/build/install/snap/.gitignore
@@ -0,0 +1 @@
+!*/
diff --git a/build/install/snap/run.sh b/build/install/snap/run.sh
new file mode 100644
index 0000000000..30b18bd80d
--- /dev/null
+++ b/build/install/snap/run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -dfr parts
+rm -dfr prime
+rm -dfr stage
+
+#snapcraft
diff --git a/build/install/snap/snap/.snapcraft/state b/build/install/snap/snap/.snapcraft/state
new file mode 100644
index 0000000000..02785499a1
--- /dev/null
+++ b/build/install/snap/snap/.snapcraft/state
@@ -0,0 +1,4 @@
+!GlobalState
+assets:
+  build-packages: []
+  build-snaps: []
diff --git a/build/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc b/build/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d6791c5e50f434ddeb7d566f4b7ade90c222bd76
GIT binary patch
literal 1031
zcmY*XOK%e~5FUG9Nt&oFEv>l1X%A`s07ank5CW>IxuBJhwcT~XF5U<BE^0%2N(Fxf
z{*tep_zRpEJDX5;?a}9%@i#9Yj7EdotMbDo1^5MbJ{R#*-0BuZii>~%h&Gr&MAmu=
z5nW>kB4>?Vh}<>yAo47xAbcnShyoy-K;8r1hb7Vt;8luOUBHMac>wtqERk<$f=@&5
zH)aB-A<=FTf8vQbtv{y&>LCJ-dD`4CtM33a#JDJYL%m}()6mgd=RD2SnP}%(nUL-}
zHUT``hEDxJ(cr=yDO>|ADdY|;0SMB~3EU8)&0WYnkk8>7{d^N<qnuMy7wOIc$fR@H
zXx8SQF<|j|-`*bB%59Lt|6Q=1o^=_*A<|nb4rdzrr_v<9pyS!X9p_(fbdZ&*iG^4M
zXXh_ozJ7lkj<l!RnoH}c2k)?ntNOKf(PkpmK~*<dRVv*x4W4C!YoA{>yiB8QqhWO{
z<AOI_D(%R&)c&lJMcnA1mQ~J^M(-OBA-G_cktJ1IHhR#dl4dfb+ErZ4bdXd<5tk{B
zv(H!}Vx<`S34h*9WK}hj6STHv)?7`w{KDn<nW|5Db5cn@vCNZ>a-zz(UWwYyQcW($
z(v0?~zLEj9WZTSg2L+G=+NVSE0QVk!L>9Yup1_f14PD)1ti&1_(*wqeDs6?qL&iS0
zu~=Cwt=vOKD?%dg8N6?Vc{wB8%1mQO?HL<SE2RTb&GE6#wXZ(5O(ryzTn|)xfz3;}
zQo3(yNn|{0qTLNV>dIOTtv~0@Tcp7u-p2siH=KCz@nB>9OKXKpQo8qeRmc<b&TTJ-
Mr2DZKJ9OLm3p#7_MgRZ+

literal 0
HcmV?d00001

diff --git a/build/install/snap/snap/plugins/x-redis.py b/build/install/snap/snap/plugins/x-redis.py
new file mode 100644
index 0000000000..9b8a922019
--- /dev/null
+++ b/build/install/snap/snap/plugins/x-redis.py
@@ -0,0 +1,27 @@
+import os
+import logging
+import shutil
+import re
+import subprocess
+
+import snapcraft
+from snapcraft.plugins import make
+
+logger = logging.getLogger(__name__)
+
+
+class RedisPlugin(make.MakePlugin):
+
+    def build(self):
+        super(make.MakePlugin, self).build()
+
+        command = ['make']
+
+        if self.options.makefile:
+            command.extend(['-f', self.options.makefile])
+
+        if self.options.make_parameters:
+            command.extend(self.options.make_parameters)
+
+        self.run(command + ['-j{}'.format(self.project.parallel_build_count)])
+        self.run(command + ['install', 'PREFIX=' + self.installdir])
diff --git a/build/install/snap/snap/snapcraft.yaml b/build/install/snap/snap/snapcraft.yaml
new file mode 100644
index 0000000000..3902f2171a
--- /dev/null
+++ b/build/install/snap/snap/snapcraft.yaml
@@ -0,0 +1,153 @@
+name: onlyoffice-communityserver
+version: "10.0.0"
+summary: ""
+description: ""
+grade: stable
+confinement: devmode
+
+apps:
+  nginx:
+    command: start_nginx
+    daemon: simple
+    restart-condition: always
+    plugs: [network, network-bind]
+  mysql:
+    command: start_mysql
+    stop-command: support-files/mysql.server stop
+    daemon: simple
+    restart-condition: always
+    plugs: [network, network-bind]
+  mysql-client:
+    command: mysql --defaults-file=$SNAP_DATA/mysql/root.ini
+    plugs: [network, network-bind]
+  mysqldump:
+    command: mysqldump --defaults-file=$SNAP_DATA/mysql/root.ini --lock-tables onlyoffice
+    plugs: [network, network-bind]
+hooks:
+  configure:
+    plugs: [network, network-bind]
+parts:
+  python:
+    plugin: python
+    python-version: python3
+
+  node:
+    plugin: nodejs
+    node-engine: 12.9.1
+
+  nginx:
+    plugin: autotools
+    source: https://github.com/nginx/nginx.git
+    source-type: git
+    # Need the prepare step because configure script resides in an unintuitive
+    # location.
+    override-build: |
+        cp auto/configure .
+        snapcraftctl build
+    build-packages:
+     - libpcre3
+     - libpcre3-dev
+     - zlib1g-dev
+    stage:
+      # Remove scripts that we'll be replacing with our own
+      - -conf/nginx.conf
+
+  nginx-customizations:
+    plugin: dump
+    source: src/nginx/
+
+  # Download the boost headers for MySQL. Note that the version used may need to
+  # be updated if the version of MySQL changes.
+  boost:
+    plugin: dump
+    source: https://github.com/kyrofa/boost_tarball/raw/master/boost_1_59_0.tar.gz
+    source-checksum: sha1/5123209db194d66d69a9cfa5af8ff473d5941d97
+    # When building MySQL, the headers in the source directory 'boost/' are
+    # required. Previously, using the 'copy' plugin, the whole archive was put
+    # under 'boost/', making the headers reside in 'boost/boost/'. Due to a bug,
+    # we now only stage the 'boost/' directory without moving it.
+    #
+    # Bug: https://bugs.launchpad.net/snapcraft/+bug/1757093
+    stage:
+      - boost/
+    prime:
+      - -*
+
+  mysql:
+    plugin: cmake
+    source: https://github.com/mysql/mysql-server.git
+    source-tag: mysql-5.7.22
+    source-depth: 1
+    override-pull: |
+      snapcraftctl pull
+      git apply $SNAPCRAFT_STAGE/support-compile-time-disabling-of-setpriority.patch
+    after: [boost, patches]
+    configflags:
+      - -DWITH_BOOST=$SNAPCRAFT_STAGE
+      - -DWITH_INNODB_PAGE_CLEANER_PRIORITY=OFF
+      - -DCMAKE_INSTALL_PREFIX=/
+      - -DBUILD_CONFIG=mysql_release
+      - -DWITH_UNIT_TESTS=OFF
+      - -DWITH_EMBEDDED_SERVER=OFF
+      - -DWITH_ARCHIVE_STORAGE_ENGINE=OFF
+      - -DWITH_BLACKHOLE_STORAGE_ENGINE=OFF
+      - -DWITH_FEDERATED_STORAGE_ENGINE=OFF
+      - -DWITH_PARTITION_STORAGE_ENGINE=OFF
+      - -DINSTALL_MYSQLTESTDIR=
+    build-packages:
+      - wget
+      - g++
+      - cmake
+      - bison
+      - libncurses5-dev
+      - libaio-dev
+    stage:
+      # Remove scripts that we'll be replacing with our own
+      - -support-files/mysql.server
+      - -COPYING
+    prime:
+      # Remove scripts that we'll be replacing with our own
+      - -support-files/mysql.server
+
+      # Remove unused binaries that waste space
+      - -bin/innochecksum
+      - -bin/lz4_decompress
+      - -bin/myisam*
+      - -bin/mysqladmin
+      - -bin/mysqlbinlog
+      - -bin/mysql_client_test
+      - -bin/mysql_config*
+      - -bin/mysqld_multi
+      - -bin/mysqlimport
+      - -bin/mysql_install_db
+      - -bin/mysql_plugin
+      - -bin/mysqlpump
+      - -bin/mysql_secure_installation
+      - -bin/mysqlshow
+      - -bin/mysqlslap
+      - -bin/mysql_ssl_rsa_setup
+      - -bin/mysqltest
+      - -bin/mysql_tzinfo_to_sql
+      - -bin/perror
+      - -bin/replace
+      - -bin/resolveip
+      - -bin/resolve_stack_dump
+      - -bin/zlib_decompress
+
+  # Copy over our MySQL scripts
+  mysql-customizations:
+    plugin: dump
+    source: src/mysql/
+  
+  patches:
+    source: src/patches
+    plugin: dump
+    prime:
+      - -*
+
+
+  hooks:
+    plugin: dump
+    source: src/hooks/
+    organize:
+      bin/: snap/hooks/
diff --git a/build/install/snap/src/hooks/bin/configure b/build/install/snap/src/hooks/bin/configure
new file mode 100755
index 0000000000..b6457d4e79
--- /dev/null
+++ b/build/install/snap/src/hooks/bin/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# shellcheck source=src/hooks/utilities/hook-utilities
+. "$SNAP/utilities/hook-utilities"
+
+# Signal to services that the configure hook is running. Useful to ensure
+# services don't restart until the configuration transaction has completed.
+set_configure_hook_running
+trap 'set_configure_hook_not_running' EXIT
+
diff --git a/build/install/snap/src/hooks/utilities/hook-utilities b/build/install/snap/src/hooks/utilities/hook-utilities
new file mode 100755
index 0000000000..c1edbe2613
--- /dev/null
+++ b/build/install/snap/src/hooks/utilities/hook-utilities
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+CONFIGURE_LOCKFILE="/tmp/locks/configure-hook"
+
+mkdir -p "$(dirname $CONFIGURE_LOCKFILE)"
+chmod 750 "$(dirname $CONFIGURE_LOCKFILE)"
+
+configure_hook_running()
+{
+	[ -f "$CONFIGURE_LOCKFILE" ]
+}
+
+set_configure_hook_running()
+{
+	touch "$CONFIGURE_LOCKFILE"
+}
+
+set_configure_hook_not_running()
+{
+	rm -f "$CONFIGURE_LOCKFILE"
+}
+
+wait_for_configure_hook()
+{
+	if configure_hook_running; then
+		printf "Waiting for configure hook... "
+		while configure_hook_running; do
+			sleep 1
+		done
+		printf "done\n"
+	fi
+}
diff --git a/build/install/snap/src/mysql/bin/start_mysql b/build/install/snap/src/mysql/bin/start_mysql
new file mode 100755
index 0000000000..d0a3c6b6b0
--- /dev/null
+++ b/build/install/snap/src/mysql/bin/start_mysql
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# shellcheck source=src/mysql/utilities/mysql-utilities
+. "$SNAP/utilities/mysql-utilities"
+
+root_option_file="$SNAP_DATA/mysql/root.ini"
+new_install=false
+
+# Make sure the database is initialized (this is safe to run if already
+# initialized)
+if mysqld --initialize-insecure --basedir="$SNAP" --datadir="$SNAP_DATA/mysql" --lc-messages-dir="$SNAP/share"; then
+	new_install=true
+fi
+
+set_mysql_setup_running
+
+# Start mysql
+"$SNAP/support-files/mysql.server" start
+
+# Initialize new installation if necessary.
+if [ $new_install = true ]; then
+	# Generate a password for the root mysql user.
+	printf "Generating root mysql password... "
+	root_password="$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c64)"
+	printf "done\n"
+
+	# Generate a password for the onlyoffice mysql user.
+	printf "Generating onlyoffice mysql password... "
+	onlyoffice_password="$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c64)"
+	printf "done\n"
+
+	# Save root user information
+	cat <<-EOF > "$root_option_file"
+		[client]
+		socket=$MYSQL_SOCKET
+		user=root
+	EOF
+	chmod 600 "$root_option_file"
+
+	# Now set everything up in one step:
+	# 1) Set the root user's password
+	# 2) Create the onlyoffice user
+	# 3) Create the onlyoffice database
+	# 4) Grant the onlyoffice user privileges on the onlyoffice database
+	printf "Setting up users and onlyoffice database... "
+	if mysql --defaults-file="$root_option_file" <<-SQL
+		ALTER USER 'root'@'localhost' IDENTIFIED BY '$root_password';
+		CREATE USER 'onlyoffice'@'localhost' IDENTIFIED WITH mysql_native_password BY '$onlyoffice_password';
+		CREATE DATABASE IF NOT EXISTS onlyoffice CHARACTER SET utf8 COLLATE 'utf8_general_ci';
+		GRANT ALL PRIVILEGES ON onlyoffice.* TO 'onlyoffice'@'localhost' IDENTIFIED WITH mysql_native_password BY '$onlyoffice_password';
+		SQL
+	then
+		printf "done\n"
+	else
+		echo "Failed to initialize-- reverting..."
+		"$SNAP/support-files/mysql.server" stop
+		rm -rf "$SNAP_DATA"/mysql/*
+	fi
+
+	# Now the root mysql user has a password. Save that as well.
+	echo "password=$root_password" >> "$root_option_file"
+else
+	# Okay, this isn't a new installation. However, we recently changed
+	# the location of MySQL's socket. Make sure the root
+	# option file is updated to look there instead of the old location.
+	sed -ri "s|(socket\s*=\s*)/var/snap/.*mysql.sock|\1$MYSQL_SOCKET|" "$root_option_file"
+fi
+
+# Wait here until mysql is running
+wait_for_mysql -f
+
+# Check and upgrade mysql tables if necessary. This will return 0 if the upgrade
+# succeeded, in which case we need to restart mysql.
+echo "Checking/upgrading mysql tables if necessary..."
+if mysql_upgrade --defaults-file="$root_option_file"; then
+	echo "Restarting mysql server after upgrade..."
+	"$SNAP/support-files/mysql.server" restart
+
+	# Wait for server to come back after upgrade
+	wait_for_mysql -f
+fi
+
+# If this was a new installation, wait until the server is all up and running
+# before saving off the onlyoffice user's password. This way the presence of the
+# file can be used as a signal that mysql is ready to be used.
+if [ $new_install = true ]; then
+	mysql_set_onlyoffice_password "$onlyoffice_password"
+fi
+
+set_mysql_setup_not_running
+
+# Wait here until mysql exits (turn a forking service into simple). This is
+# only needed for Ubuntu Core 15.04, as 16.04 supports forking services.
+pid=$(mysql_pid)
+while kill -0 "$pid" 2>/dev/null; do
+	sleep 1
+done
diff --git a/build/install/snap/src/mysql/my.cnf b/build/install/snap/src/mysql/my.cnf
new file mode 100644
index 0000000000..269102c561
--- /dev/null
+++ b/build/install/snap/src/mysql/my.cnf
@@ -0,0 +1,8 @@
+[mysqld]
+user=root
+secure-file-priv=NULL
+skip-networking
+sql_mode = 'NO_ENGINE_SUBSTITUTION'
+max_connections = 1000
+max_allowed_packet = 1048576000
+group_concat_max_len = 2048
diff --git a/build/install/snap/src/mysql/support-files/.mysql.server.swp b/build/install/snap/src/mysql/support-files/.mysql.server.swp
new file mode 100644
index 0000000000000000000000000000000000000000..349dcf7cacd3e41fec66728215f9c84cbbd888d2
GIT binary patch
literal 1024
zcmYc?$V<%2S1{5u)iY*50{d(j7>e@qOOS+cGE0+6^GZr}i**glk_$?8jnb2Ji_`Lr
hbPWtqwd7V77v|^{rxul^7NN?F@<u~oGz11B1OVq86UqPp

literal 0
HcmV?d00001

diff --git a/build/install/snap/src/mysql/support-files/mysql.server b/build/install/snap/src/mysql/support-files/mysql.server
new file mode 100755
index 0000000000..d6fb637d1d
--- /dev/null
+++ b/build/install/snap/src/mysql/support-files/mysql.server
@@ -0,0 +1,315 @@
+#!/bin/sh
+# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+# This file is public domain and comes with NO WARRANTY of any kind
+
+# MySQL daemon start/stop script.
+
+# Usually this is put in /etc/init.d (at least on machines SYSV R4 based
+# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql.
+# When this is done the mysql server will be started when the machine is
+# started and shut down when the systems goes down.
+
+# Comments to support chkconfig on RedHat Linux
+# chkconfig: 2345 64 36
+# description: A very fast and reliable SQL database engine.
+
+# Comments to support LSB init script conventions
+### BEGIN INIT INFO
+# Provides: mysql
+# Required-Start: $local_fs $network $remote_fs
+# Should-Start: ypbind nscd ldap ntpd xntpd
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop MySQL
+# Description: MySQL is a very fast and reliable SQL database engine.
+### END INIT INFO
+
+# If you install MySQL on some other places than /, then you
+# have to do one of the following things for this script to work:
+#
+# - Run this script from within the MySQL installation directory
+# - Create a /etc/my.cnf file with the following information:
+#   [mysqld]
+#   basedir=<path-to-mysql-installation-directory>
+# - Add the above to any other configuration file (for example ~/.my.ini)
+#   and copy my_print_defaults to /usr/bin
+# - Add the path to the mysql-installation-directory to the basedir variable
+#   below.
+#
+# If you want to affect other MySQL variables, you should make your changes
+# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
+
+# If you change base dir, you must also change datadir. These may get
+# overwritten by settings in the MySQL configuration files.
+
+# shellcheck source=src/mysql/utilities/mysql-utilities
+. "$SNAP/utilities/mysql-utilities"
+
+basedir="$SNAP"
+datadir="$SNAP_DATA/mysql"
+
+# Default value, in seconds, afterwhich the script should timeout waiting
+# for server start.
+# Value here is overriden by value in my.cnf.
+# 0 means don't wait at all
+# Negative numbers mean to wait indefinitely
+service_startup_timeout=900
+
+# Lock directory for RedHat / SuSE.
+lockdir="$SNAP_DATA/mysql/lock"
+lock_file_path="$lockdir/mysql"
+
+# The following variables are only set for letting mysql.server find things.
+
+# Set some defaults
+mysqld_pid_file_path="$MYSQL_PIDFILE"
+if test -z "$basedir"
+then
+  basedir=/
+  bindir=//bin
+  if test -z "$datadir"
+  then
+    datadir=//data
+  fi
+  libexecdir=//bin
+else
+  bindir="$basedir/bin"
+  if test -z "$datadir"
+  then
+    datadir="$basedir/data"
+  fi
+  libexecdir="$basedir/libexec"
+fi
+
+#
+# Use LSB init script functions for printing messages, if possible
+#
+lsb_functions="/lib/lsb/init-functions"
+if test -f $lsb_functions ; then
+  . $lsb_functions
+else
+  log_success_msg()
+  {
+    echo " SUCCESS! $*"
+  }
+  log_failure_msg()
+  {
+    echo " ERROR! $*"
+  }
+fi
+
+PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin"
+export PATH
+
+mode=$1    # start or stop
+
+[ $# -ge 1 ] && shift
+
+
+other_args="$*"   # uncommon, but needed when called from an RPM upgrade action
+           # Expected: "--skip-networking --skip-grant-tables"
+           # They are not checked here, intentionally, as it is the resposibility
+           # of the "spec" file author to give correct arguments only.
+
+# Upstream mysql stuff, no need to fix this
+# shellcheck disable=SC2116,SC2039
+case "$(echo "testing\c")","$(echo -n testing)" in
+    *c*,-n*) echo_n=""   echo_c=""     ;;
+    *c*,*)   echo_n=-n echo_c=""     ;;
+    *)       echo_n=""   echo_c='\c' ;;
+esac
+
+wait_for_pid () {
+  verb="$1"           # created | removed
+  pid="$2"            # process ID of the program operating on the pid-file
+  pid_file_path="$3" # path to the PID file.
+
+  i=0
+  avoid_race_condition="by checking again"
+
+  while test "$i" -ne "$service_startup_timeout" ; do
+
+    case "$verb" in
+      'created')
+        # wait for a PID-file to pop into existence.
+        test -s "$pid_file_path" && i='' && break
+        ;;
+      'removed')
+        # wait for this PID-file to disappear
+        test ! -s "$pid_file_path" && i='' && break
+        ;;
+      *)
+        echo "wait_for_pid () usage: wait_for_pid created|removed pid pid_file_path"
+        exit 1
+        ;;
+    esac
+
+    # if server isn't running, then pid-file will never be updated
+    if test -n "$pid"; then
+      if kill -0 "$pid" 2>/dev/null; then
+        :  # the server still runs
+      else
+        # The server may have exited between the last pid-file check and now.
+        if test -n "$avoid_race_condition"; then
+          avoid_race_condition=""
+          continue  # Check again.
+        fi
+
+        # there's nothing that will affect the file.
+        log_failure_msg "The server quit without updating PID file ($pid_file_path)."
+        return 1  # not waiting any more.
+      fi
+    fi
+
+    echo $echo_n ".$echo_c"
+    i=$((i + 1))
+    sleep 1
+
+  done
+
+  if test -z "$i" ; then
+    log_success_msg
+    return 0
+  else
+    log_failure_msg
+    return 1
+  fi
+}
+
+#
+# Set pid file if not given
+#
+if test -z "$mysqld_pid_file_path"
+then
+  mysqld_pid_file_path="$datadir"/"$(hostname)".pid
+else
+  case "$mysqld_pid_file_path" in
+    /* ) ;;
+    * )  mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;;
+  esac
+fi
+
+case "$mode" in
+  'start')
+    # Start daemon
+
+    # Safeguard (relative paths, core dumps..)
+    cd "$basedir" || exit
+
+    echo $echo_n "Starting MySQL"
+    if test -x "$bindir/mysqld_safe"
+    then
+      # Give extra arguments to mysqld with the my.cnf file. This script
+      # may be overwritten at next upgrade.
+      "$bindir/mysqld_safe" --datadir="$datadir" --pid-file="$mysqld_pid_file_path" --lc-messages-dir="$SNAP/share" --socket="$MYSQL_SOCKET" "$other_args" >/dev/null 2>&1 &
+      wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$?
+
+      # Make lock for RedHat / SuSE
+      if test -w "$lockdir"
+      then
+        touch "$lock_file_path"
+      fi
+
+      exit $return_value
+    else
+      log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)"
+    fi
+    ;;
+
+  'stop')
+    # Stop daemon. We use a signal here to avoid having to know the
+    # root password.
+
+    if test -s "$mysqld_pid_file_path"
+    then
+      # signal mysqld_safe that it needs to stop
+      touch "$mysqld_pid_file_path.shutdown"
+
+      mysqld_pid="$(cat "$mysqld_pid_file_path")"
+
+      if (kill -0 "$mysqld_pid" 2>/dev/null)
+      then
+        echo $echo_n "Shutting down MySQL"
+        kill "$mysqld_pid"
+        # mysqld should remove the pid file when it exits, so wait for it.
+        wait_for_pid removed "$mysqld_pid" "$mysqld_pid_file_path"; return_value=$?
+      else
+        log_failure_msg "MySQL server process #$mysqld_pid is not running!"
+        rm "$mysqld_pid_file_path"
+      fi
+
+      # Delete lock for RedHat / SuSE
+      if test -f "$lock_file_path"
+      then
+        rm -f "$lock_file_path"
+      fi
+      exit $return_value
+    else
+      log_failure_msg "MySQL server PID file could not be found!"
+    fi
+    ;;
+
+  'restart')
+    # Stop the service and regardless of whether it was
+    # running or not, start it again.
+    if $0 stop  "$other_args"; then
+      $0 start "$other_args"
+    else
+      log_failure_msg "Failed to stop running server, so refusing to try to start."
+      exit 1
+    fi
+    ;;
+
+  'reload'|'force-reload')
+    if test -s "$mysqld_pid_file_path" ; then
+      read -r mysqld_pid <  "$mysqld_pid_file_path"
+      kill -HUP "$mysqld_pid" && log_success_msg "Reloading service MySQL"
+      touch "$mysqld_pid_file_path"
+    else
+      log_failure_msg "MySQL PID file could not be found!"
+      exit 1
+    fi
+    ;;
+  'status')
+    # First, check to see if pid file exists
+    if test -s "$mysqld_pid_file_path" ; then
+      read -r mysqld_pid < "$mysqld_pid_file_path"
+      if kill -0 "$mysqld_pid" 2>/dev/null ; then
+        log_success_msg "MySQL running ($mysqld_pid)"
+        exit 0
+      else
+        log_failure_msg "MySQL is not running, but PID file exists"
+        exit 1
+      fi
+    else
+      # Try to find appropriate mysqld process
+      mysqld_pid="$(pidof "$libexecdir/mysqld")"
+
+      # test if multiple pids exist
+      pid_count="$(echo "$mysqld_pid" | wc -w)"
+      if test "$pid_count" -gt 1 ; then
+        log_failure_msg "Multiple MySQL running but PID file could not be found ($mysqld_pid)"
+        exit 5
+      elif test -z "$mysqld_pid" ; then
+        if test -f "$lock_file_path" ; then
+          log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists"
+          exit 2
+        fi
+        log_failure_msg "MySQL is not running"
+        exit 3
+      else
+        log_failure_msg "MySQL is running but PID file could not be found"
+        exit 4
+      fi
+    fi
+    ;;
+    *)
+      # usage
+      basename="$(basename "$0")"
+      echo "Usage: $basename  {start|stop|restart|reload|force-reload|status}  [ MySQL server options ]"
+      exit 1
+    ;;
+esac
+
+exit 0
diff --git a/build/install/snap/src/mysql/utilities/mysql-utilities b/build/install/snap/src/mysql/utilities/mysql-utilities
new file mode 100755
index 0000000000..7f7eb2cbc7
--- /dev/null
+++ b/build/install/snap/src/mysql/utilities/mysql-utilities
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+export MYSQL_PIDFILE="/tmp/pids/mysql.pid"
+export MYSQL_SOCKET="/tmp/sockets/mysql.sock"
+export ONLYOFFICE_PASSWORD_FILE="$SNAP_DATA/mysql/onlyoffice_password"
+MYSQL_SETUP_LOCKFILE="/tmp/locks/mysql-setup"
+
+mkdir -p "$(dirname "$MYSQL_PIDFILE")"
+mkdir -p "$(dirname "$MYSQL_SOCKET")"
+chmod 750 "$(dirname "$MYSQL_PIDFILE")"
+chmod 750 "$(dirname "$MYSQL_SOCKET")"
+
+mysql_is_running()
+{
+	# Arguments:
+	#  -f: Force the check, i.e. ignore if it's currently in setup
+	[ -f "$MYSQL_PIDFILE" ] && [ -S "$MYSQL_SOCKET" ] && (! mysql_setup_running || [ "$1" = "-f" ])
+}
+
+wait_for_mysql()
+{
+	# Arguments:
+	#  -f: Force the check, i.e. ignore if it's currently in setup
+	if ! mysql_is_running "$@"; then
+		printf "Waiting for MySQL... "
+		while ! mysql_is_running "$@"; do
+			sleep 1
+		done
+		printf "done\n"
+	fi
+}
+
+mysql_setup_running()
+{
+	[ -f "$MYSQL_SETUP_LOCKFILE" ]
+}
+
+set_mysql_setup_running()
+{
+	touch "$MYSQL_SETUP_LOCKFILE"
+}
+
+set_mysql_setup_not_running()
+{
+	rm -f "$MYSQL_SETUP_LOCKFILE"
+}
+
+mysql_pid()
+{
+	if mysql_is_running; then
+		cat "$MYSQL_PIDFILE"
+	else
+		echo "Unable to get MySQL PID as it's not yet running" >&2
+		echo ""
+	fi
+}
+
+mysql_set_onlyoffice_password()
+{
+	echo "$1" > "$ONLYOFFICE_PASSWORD_FILE"
+	chmod 600 "$ONLYOFFICE_PASSWORD_FILE"
+}
+
+mysql_get_onlyoffice_password()
+{
+	if [ -f "$ONLYOFFICE_PASSWORD_FILE" ]; then
+		cat "$ONLYOFFICE_PASSWORD_FILE"
+	else
+		echo "MySQL ONLYOFFICE password has not yet been generated" >&2
+		echo ""
+	fi
+}
diff --git a/build/install/snap/src/nginx/bin/start_nginx b/build/install/snap/src/nginx/bin/start_nginx
new file mode 100755
index 0000000000..c1719d3a6c
--- /dev/null
+++ b/build/install/snap/src/nginx/bin/start_nginx
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# shellcheck source=src/nginx/utilities/nginx-utilities
+. "$SNAP/utilities/nginx-utilities"
+
+cp -dfr ${SNAP}/config/nginx-config/* ${SNAP_DATA}/nginx/config
+
+sed -e "s|\${SNAP}|$SNAP|;s|\${SNAP_DATA}|$SNAP_DATA|;s|\${NGINX_PIDFILE}|$NGINX_PIDFILE|;s|\${ONLYOFFICE_SOCKET}|$ONLYOFFICE_SOCKET|;s|\${ONLYOFFICE_API_SYSTEM_SOCKET}|$ONLYOFFICE_API_SYSTEM_SOCKET|" -i ${SNAP_DATA}/nginx/config/conf.d/onlyoffice
+sed -e "s|\${SNAP}|$SNAP|;s|\${SNAP_DATA}|$SNAP_DATA|;s|\${NGINX_PIDFILE}|$NGINX_PIDFILE|;s|\${ONLYOFFICE_SOCKET}|$ONLYOFFICE_SOCKET|;s|\${ONLYOFFICE_API_SYSTEM_SOCKET}|$ONLYOFFICE_API_SYSTEM_SOCKET|" -i ${SNAP_DATA}/nginx/config/conf.d/includes/onlyoffice-communityserver-common.conf
+sed -e "s|\${SNAP}|$SNAP|;s|\${SNAP_DATA}|$SNAP_DATA|;s|\${NGINX_PIDFILE}|$NGINX_PIDFILE|;s|\${ONLYOFFICE_SOCKET}|$ONLYOFFICE_SOCKET|;s|\${ONLYOFFICE_API_SYSTEM_SOCKET}|$ONLYOFFICE_API_SYSTEM_SOCKET|" -i ${SNAP_DATA}/nginx/config/nginx.conf
+
+exec "$SNAP/sbin/nginx" "-c" "$SNAP_DATA/nginx/config/nginx.conf" "-p" "$SNAP_DATA/nginx" "-g" "daemon off;" "$@"
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-init.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-init.conf.template
new file mode 100644
index 0000000000..e713c3312f
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-init.conf.template
@@ -0,0 +1,43 @@
+upstream fastcgi_backend {
+        server unix:/var/run/onlyoffice/onlyoffice.socket;
+        keepalive 32;
+}
+
+server {
+        listen 80;
+
+        fastcgi_keep_conn on;
+        fastcgi_index   Default.aspx;
+        fastcgi_intercept_errors on;
+
+
+        include fastcgi_params;
+
+        fastcgi_param HTTP_X_REWRITER_URL $http_x_rewriter_url;
+        fastcgi_param SERVER_NAME $host;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO "";
+
+        fastcgi_read_timeout    600;
+        fastcgi_send_timeout    600;
+
+
+        location / {
+                root    /var/www/onlyoffice/WebStudio/;
+                expires           0;
+                add_header        Cache-Control no-cache;
+                rewrite ^(.*)$ /StartConfigure.htm  break;
+        }
+
+	location /api {
+		fastcgi_pass fastcgi_backend;
+		break;
+	}
+
+        location  ~* ^/(warmup[2-9]?)/ {
+		rewrite /warmup([^/]*)/(.*) /$2 break;
+                fastcgi_pass unix:/var/run/onlyoffice/onlyoffice$1.socket;
+        }
+}
+
+
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-ssl.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-ssl.conf.template
new file mode 100644
index 0000000000..fad50ea9df
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common-ssl.conf.template
@@ -0,0 +1,129 @@
+upstream fastcgi_backend_apisystem {
+        server unix:/var/run/onlyoffice/onlyofficeApiSystem.socket;
+        keepalive 32;
+}
+
+upstream fastcgi_backend {
+	server unix:/var/run/onlyoffice/onlyoffice.socket;
+	keepalive {{ONLYOFFICE_NIGNX_KEEPLIVE}};
+}
+
+fastcgi_cache_path /var/cache/nginx/onlyoffice
+	levels=1:2
+	keys_zone=onlyoffice:16m
+	max_size=256m
+	inactive=1d;
+
+geo $ip_external {
+     default 1;
+     {{DOCKER_ONLYOFFICE_SUBNET}} 0;
+     127.0.0.1 0;
+}
+
+map $http_host $this_host {
+  "" $host;
+  default $http_host;
+}
+
+map $http_x_forwarded_proto $the_scheme {
+  default $http_x_forwarded_proto;
+  "" $scheme;
+}
+
+map $http_x_forwarded_host $the_host {
+  default $http_x_forwarded_host;
+  "" $this_host;
+}
+
+## Normal HTTP host
+server {
+	listen 0.0.0.0:80;
+	listen [::]:80 default_server;
+	server_name _;
+	server_tokens off;
+
+        root /nowhere; ## root doesn't have to be a valid path since we are redirecting
+
+        location / {
+	        if ($ip_external) {
+	                ## Redirects all traffic to the HTTPS host
+      		         rewrite ^ https://$host$request_uri? permanent;
+                }
+
+
+                client_max_body_size 100m;
+
+                proxy_pass https://127.0.0.1;
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "upgrade";
+                proxy_set_header Host $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 $server_name;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                proxy_ssl_verify off;
+        }
+}
+
+## HTTPS host
+server {
+	listen 0.0.0.0:443 ssl;
+	listen [::]:443 ssl default_server;
+	server_tokens off;
+	root /usr/share/nginx/html;
+
+	## Increase this if you want to upload large attachments
+	client_max_body_size 100m;
+
+	## Strong SSL Security
+	## https://cipherli.st/
+	ssl on;
+	ssl_certificate {{SSL_CERTIFICATE_PATH}};
+	ssl_certificate_key {{SSL_KEY_PATH}};
+	ssl_verify_client {{SSL_VERIFY_CLIENT}};
+	ssl_client_certificate {{CA_CERTIFICATES_PATH}};
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+	ssl_prefer_server_ciphers on;
+	ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
+	ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0
+	ssl_session_cache shared:SSL:10m;
+	ssl_session_tickets off; # Requires nginx >= 1.5.9
+
+	add_header Strict-Transport-Security "max-age={{ONLYOFFICE_HTTPS_HSTS_MAXAGE}}; includeSubDomains; preload" always;
+#	add_header X-Frame-Options DENY;
+	add_header X-Content-Type-Options nosniff;
+	add_header Access-Control-Allow-Origin *;	
+
+	## [Optional] If your certficate has OCSP, enable OCSP stapling to reduce the overhead and latency of running SSL.
+	## Replace with your ssl_trusted_certificate. For more info see:
+	## - https://medium.com/devops-programming/4445f4862461
+	## - https://www.ruby-forum.com/topic/4419319
+	## - https://www.digitalocean.com/community/tutorials/how-to-configure-ocsp-stapling-on-apache-and-nginx
+	ssl_stapling on;
+	ssl_stapling_verify on;
+	ssl_trusted_certificate {{SSL_OCSP_CERTIFICATE_PATH}};
+	resolver 8.8.8.8 8.8.4.4 127.0.0.11 valid=300s; # Can change to your DNS resolver if desired
+	resolver_timeout 10s;
+
+	## [Optional] Generate a stronger DHE parameter:
+	## cd /etc/ssl/certs
+	## sudo openssl dhparam -out dhparam.pem 4096
+	##
+	ssl_dhparam {{SSL_DHPARAM_PATH}};
+
+	large_client_header_buffers 4 16k;
+
+        set $X_REWRITER_URL $the_scheme://$the_host;
+
+        if ($http_x_rewriter_url != '') {
+                set $X_REWRITER_URL $http_x_rewriter_url ;
+        }
+
+
+        include /etc/nginx/includes/onlyoffice-communityserver-*.conf;
+}
+
+
+
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf
new file mode 100644
index 0000000000..e095919623
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf
@@ -0,0 +1,83 @@
+location / {
+        root    ${SNAP}/var/www/onlyoffice/WebStudio/;
+        index   index.html index.htm default.aspx Default.aspx;
+
+        client_max_body_size    4G;
+
+        fastcgi_pass fastcgi_backend;
+        fastcgi_keep_conn on;
+        
+        error_page 404 /404.htm;
+
+        gzip             off;
+        gzip_comp_level  2;
+        gzip_min_length  1000;
+        gzip_proxied     expired no-cache no-store private auth;
+        gzip_types       text/html application/x-javascript text/css application/xml;
+
+        fastcgi_index   Default.aspx;
+        fastcgi_intercept_errors on;
+
+        include ${SNAP}/conf/fastcgi_params;
+
+        fastcgi_param HTTP_X_REWRITER_URL $X_REWRITER_URL;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO "";
+
+        fastcgi_read_timeout    600;
+        fastcgi_send_timeout    600;
+
+        location ~* (^\/(?:skins|products|addons).*\.(?:jpg|jpeg|gif|png|svg|ico)$)|(.*bundle/(?!clientscript).*) {
+                fastcgi_pass fastcgi_backend;
+
+                fastcgi_temp_path        ${SNAP_DATA}/nginx/cache/tmp 1 2;
+                fastcgi_cache            onlyoffice;
+                fastcgi_cache_key        "$scheme|$request_method|$host|$request_uri|$query_string";
+                fastcgi_cache_use_stale  updating error timeout invalid_header http_500;
+                fastcgi_cache_valid      1d;
+                fastcgi_ignore_headers   Cache-Control Expires Set-Cookie;
+
+                add_header X-Fastcgi-Cache $upstream_cache_status;
+                access_log off;
+                log_not_found off;
+                expires max;
+        }
+
+}
+
+location /apisystem {
+	rewrite /apisystem(.*) /$1  break;
+
+        root    ${SNAP}/var/www/onlyoffice/ApiSystem/;
+        index    index.html index.htm default.aspx Default.aspx;
+
+        add_header    Access-Control-Allow-Origin *;
+        add_header    X-Frame-Options DENY;
+
+        client_max_body_size    4G;
+
+        fastcgi_keep_conn on;
+        fastcgi_pass fastcgi_backend_apisystem;
+
+        include ${SNAP}/conf/fastcgi_params;
+
+        set $X_REWRITER_URL $scheme://$http_host;
+
+        if ($http_x_rewriter_url != '') {
+          set $X_REWRITER_URL $http_x_rewriter_url ;
+        }
+
+
+        fastcgi_param   HTTP_X_REWRITER_URL $X_REWRITER_URL;
+        fastcgi_param   SCRIPT_FILENAME                 $document_root$fastcgi_script_name;
+        fastcgi_param   PATH_INFO                       "";
+
+        fastcgi_read_timeout    600;
+        fastcgi_send_timeout    600;
+}
+
+location /filesData {
+        rewrite /filesData/var/www/onlyoffice/Data/Products/Files(.*) /$1  break;
+        root    ${SNAP_DATA}/onlyoffice/Data/Products/Files;
+        internal;
+}
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf.template
new file mode 100644
index 0000000000..ad47769d78
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-common.conf.template
@@ -0,0 +1,46 @@
+upstream fastcgi_backend_apisystem {
+        server unix:/var/run/onlyoffice/onlyofficeApiSystem.socket;
+        keepalive 32;
+}
+
+upstream fastcgi_backend {
+	server unix:/var/run/onlyoffice/onlyoffice.socket;
+	keepalive {{ONLYOFFICE_NIGNX_KEEPLIVE}};
+}
+
+fastcgi_cache_path /var/cache/nginx/onlyoffice
+	levels=1:2
+	keys_zone=onlyoffice:16m
+	max_size=256m
+	inactive=1d;
+
+map $http_host $this_host {
+  "" $host;
+  default $http_host;
+}
+
+map $http_x_forwarded_proto $the_scheme {
+  default $http_x_forwarded_proto;
+  "" $scheme;
+}
+
+map $http_x_forwarded_host $the_host {
+  default $http_x_forwarded_host;
+  "" $this_host;
+}
+
+server {
+	listen 80;
+	
+	add_header Access-Control-Allow-Origin *;
+
+	large_client_header_buffers 4 16k;
+
+        set $X_REWRITER_URL $the_scheme://$the_host;
+
+        if ($http_x_rewriter_url != '') {
+                set $X_REWRITER_URL $http_x_rewriter_url ;
+        }
+        
+	include /etc/nginx/includes/onlyoffice-communityserver-*.conf;
+}
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-letsencrypt.conf b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-letsencrypt.conf
new file mode 100644
index 0000000000..77a7050fe1
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-letsencrypt.conf
@@ -0,0 +1,3 @@
+location /.well-known/acme-challenge {
+   root /var/www/onlyoffice/Data/certs/;
+}
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-nginx.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-nginx.conf.template
new file mode 100644
index 0000000000..a61a6b92db
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-nginx.conf.template
@@ -0,0 +1,32 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+    include /etc/nginx/sites-enabled/*;
+    include /etc/nginx/conf.d/*.conf;
+}
+
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-controlpanel.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-controlpanel.conf.template
new file mode 100644
index 0000000000..bff6b556c2
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-controlpanel.conf.template
@@ -0,0 +1,36 @@
+location /controlpanel {
+                proxy_pass http://{{CONTROL_PANEL_HOST_ADDR}};
+
+                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 $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 $server_name;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
+}
+
+location /sso/ {
+                proxy_pass http://{{SERVICE_SSO_AUTH_HOST_ADDR}}:9834;
+
+                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 $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 $server_name;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
+
+		proxy_redirect / /;
+
+}
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-documentserver.conf.template b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-documentserver.conf.template
new file mode 100644
index 0000000000..368ab4fdc5
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-proxy-to-documentserver.conf.template
@@ -0,0 +1,18 @@
+location ~* ^/ds-vpath/ {
+                rewrite /ds-vpath/(.*) /$1  break;
+                proxy_pass {{DOCUMENT_SERVER_HOST_ADDR}};
+                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;
+}
+
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-services.conf b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-services.conf
new file mode 100644
index 0000000000..9d5281d6f4
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/includes/onlyoffice-communityserver-services.conf
@@ -0,0 +1,44 @@
+location /addons/talk/http-poll/httppoll.ashx {
+        proxy_pass http://localhost:5280/http-poll/;
+        proxy_buffering off;
+        client_max_body_size 10m;
+        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 $server_name;
+}
+
+
+location /socketio {
+        rewrite /socketio/(.*) /$1  break;
+        proxy_pass http://localhost:9899;
+
+        client_max_body_size 100m;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        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 $server_name;
+        proxy_set_header X-Forwarded-Proto "http";
+        proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
+}
+
+
+location /healthcheck {
+        rewrite /healthcheck(.*) /$1  break;
+        proxy_pass http://localhost:9810;
+        proxy_redirect ~*/(.*) /healthcheck/$1;
+
+        client_max_body_size 100m;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        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 $server_name;
+        proxy_set_header X-Forwarded-Proto $scheme;
+}
diff --git a/build/install/snap/src/nginx/config/nginx-config/conf.d/onlyoffice b/build/install/snap/src/nginx/config/nginx-config/conf.d/onlyoffice
new file mode 100644
index 0000000000..39e496d5e9
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/conf.d/onlyoffice
@@ -0,0 +1,46 @@
+upstream fastcgi_backend_apisystem {
+        server unix:${ONLYOFFICE_API_SYSTEM_SOCKET};
+        keepalive 32;
+}
+
+upstream fastcgi_backend {
+	server unix:${ONLYOFFICE_SOCKET};
+	keepalive 32;
+}
+
+fastcgi_cache_path ${SNAP_DATA}/nginx/cache/onlyoffice
+	levels=1:2
+	keys_zone=onlyoffice:16m
+	max_size=256m
+	inactive=1d;
+
+map $http_host $this_host {
+  "" $host;
+  default $http_host;
+}
+
+map $http_x_forwarded_proto $the_scheme {
+  default $http_x_forwarded_proto;
+  "" $scheme;
+}
+
+map $http_x_forwarded_host $the_host {
+  default $http_x_forwarded_host;
+  "" $this_host;
+}
+	
+server {
+	listen 80;
+
+        add_header Access-Control-Allow-Origin *;
+
+	large_client_header_buffers 4 16k;
+
+        set $X_REWRITER_URL $the_scheme://$the_host;
+
+        if ($http_x_rewriter_url != '') {
+                set $X_REWRITER_URL $http_x_rewriter_url ;
+        }
+        
+	include ${SNAP_DATA}/nginx/config/conf.d/includes/onlyoffice-communityserver-*.conf;
+}	
diff --git a/build/install/snap/src/nginx/config/nginx-config/nginx.conf b/build/install/snap/src/nginx/config/nginx-config/nginx.conf
new file mode 100644
index 0000000000..4d266bdd6d
--- /dev/null
+++ b/build/install/snap/src/nginx/config/nginx-config/nginx.conf
@@ -0,0 +1,30 @@
+user  root;
+worker_processes 2;
+
+error_log  ${SNAP_DATA}/nginx/logs/error.log warn;
+pid        ${NGINX_PIDFILE};
+
+
+events {
+    worker_connections 1048576;
+}
+
+
+http {
+    include       ${SNAP}/conf/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  ${SNAP_DATA}/nginx/logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+    include ${SNAP_DATA}/nginx/config/conf.d/onlyoffice;
+}
diff --git a/build/install/snap/src/nginx/utilities/nginx-utilities b/build/install/snap/src/nginx/utilities/nginx-utilities
new file mode 100755
index 0000000000..e2f34ea0ff
--- /dev/null
+++ b/build/install/snap/src/nginx/utilities/nginx-utilities
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+export NGINX_PIDFILE="/tmp/pids/nginx.pid"
+
+mkdir -p "$(dirname "$NGINX_PIDFILE")"
+chmod 750 "$(dirname "$NGINX_PIDFILE")"
+
+mkdir -p ${SNAP_DATA}/nginx/logs
+chmod 750 ${SNAP_DATA}/nginx/logs
+
+mkdir -p ${SNAP_DATA}/nginx/cache
+chmod 750 ${SNAP_DATA}/nginx/cache
+
+mkdir -p ${SNAP_DATA}/nginx/config
+chmod 750 ${SNAP_DATA}/nginx/config
+
+
diff --git a/build/install/snap/src/onlyoffice/bin/start_monoserve b/build/install/snap/src/onlyoffice/bin/start_monoserve
new file mode 100755
index 0000000000..6481c2bb9b
--- /dev/null
+++ b/build/install/snap/src/onlyoffice/bin/start_monoserve
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+set -x
+
+# shellcheck source=src/mysql/utilities/mysql-utilities
+. "$SNAP/utilities/mysql-utilities"
+
+# shellcheck source=src/onlyoffice/utilities/monoserve-utilities
+. "${SNAP}/utilities/monoserve-utilities"
+
+# shellcheck source=src/redis/utilities/redis-utilities
+. "$SNAP/utilities/redis-utilities"
+
+
+wait_for_redis
+wait_for_mysql
+
+DB_NAME="onlyoffice";
+DB_HOST="localhost";
+DB_USER="onlyoffice";
+DB_PWD=$( mysql_get_onlyoffice_password );
+
+
+ONLYOFFICE_CORE_MACHINEKEY=$( onlyoffice_get_core_machine_key );
+
+cp -drf ${SNAP}/config/hyperfastcgi-config/* ${SNAP_DATA}/hyperfastcgi/
+
+[ -e ${ONLYOFFCE_SOCKET} ] && rm -f ${ONLYOFFCE_SOCKET}
+
+sed -e "s|\${SNAP}|$SNAP|;s|\${SNAP_DATA}|$SNAP_DATA|;s|\${ONLYOFFICE_SOCKET}|$ONLYOFFICE_SOCKET|" -i ${SNAP_DATA}/hyperfastcgi/onlyoffice
+
+mkdir -p  ${SNAP_DATA}/onlyoffice/config/WebStudio/
+cp -dfr ${SNAP}/var/www/onlyoffice/WebStudio/*.config ${SNAP_DATA}/onlyoffice/config/WebStudio/
+
+sed "/core.machinekey/s!value=\".*\"!value=\"${ONLYOFFICE_CORE_MACHINEKEY}\"!g" -i  ${SNAP_DATA}/onlyoffice/config/WebStudio/web.appsettings.config
+sed "s!/var/log/onlyoffice/!${SNAP_DATA}/onlyoffice/logs/!g" -i ${SNAP_DATA}/onlyoffice/config/WebStudio/web.log4net.config
+sed "s|\.*\\\Data\\\|${SNAP_DATA}/onlyoffice/data/|g" -i ${SNAP_DATA}/onlyoffice/config/WebStudio/web.storage.config
+
+sed "s|Password=.*;|Password=${DB_PWD};|g" -i ${SNAP_DATA}/onlyoffice/config/WebStudio/web.connections.config
+sed "s|User\\s*ID=.*;|User\\s*ID=${DB_USER};|g" -i ${SNAP_DATA}/onlyoffice/config/WebStudio/web.connections.config
+
+
+export ONLYOFFICE_APP_CONFIG_FILE="${SNAP_DATA}/onlyoffice/config/WebStudio/Web.config";
+
+MYSQL="mysql -h$DB_HOST -u$DB_USER -p$DB_PWD -S$MYSQL_SOCKET";
+
+DB_TABLES_COUNT=$($MYSQL --silent --skip-column-names -e "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='${DB_NAME}'");
+
+if [ "${DB_TABLES_COUNT}" -eq "0" ]; then
+
+	$MYSQL "$DB_NAME" < $SNAP/var/www/onlyoffice/Sql/onlyoffice.sql
+	$MYSQL "$DB_NAME" < $SNAP/var/www/onlyoffice/Sql/onlyoffice.data.sql
+	$MYSQL "$DB_NAME" < $SNAP/var/www/onlyoffice/Sql/onlyoffice.resources.sql
+fi
+
+for i in $(ls $SNAP/var/www/onlyoffice/Sql/onlyoffice.upgrade*); do
+	$MYSQL "$DB_NAME" < ${i};
+done
+
+# export mono variables
+export MONO_IOMAP=all
+export MONO_ASPNET_WEBCONFIG_CACHESIZE=2000
+export MONO_THREADS_PER_CPU=2000
+export MONO_OPTIONS="--server"
+export MONO_GC_PARAMS=nursery-size=64m
+
+PKG_DIR=$SNAP/usr
+
+export MONO_PATH=$PKG_DIR/lib/mono/4.5
+export MONO_CONFIG=$SNAP/etc/mono/config
+export MONO_CFG_DIR=$SNAP/etc
+export C_INCLUDE_PATH=${PKG_DIR}/include
+export MONO_REGISTRY_PATH=~/.mono/registry
+export MONO_GAC_PREFIX=$PKG_DIR/lib/mono/gac/
+#export LD_LIBRARY_PATH=$PKG_DIR/lib:$LD_LIBRARY_PATH
+
+export LD_RUN_PATH=$LD_LIBRARY_PATH
+#export LD_DEBUG=files
+
+export PKG_CONFIG_PATH=$PKG_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+export ACLOCAL_PATH=${PKG_DIR}/share/aclocal
+#export MONO_LOG_LEVEL=debug
+#export FONTCONFIG_PATH=${PKG_DIR}/etc/fonts
+#export XDG_DATA_HOME=${PKG_DIR}/etc/fonts
+
+
+exec ${SNAP}/usr/bin/mono ${SNAP}/usr/lib/hyperfastcgi/4.0/HyperFastCgi.exe /config=${SNAP_DATA}/hyperfastcgi/onlyoffice /logfile=${SNAP_DATA}/onlyoffice/logs/onlyoffice.log
diff --git a/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyoffice b/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyoffice
new file mode 100644
index 0000000000..9418beb0db
--- /dev/null
+++ b/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyoffice
@@ -0,0 +1,24 @@
+<configuration>
+	<server type="HyperFastCgi.ApplicationServers.SimpleApplicationServer">
+		<root-dir>${SNAP}/var/www/onlyoffice/WebStudio</root-dir>
+		<threads min-worker="40" max-worker="0" min-io="4" max-io="0" />
+	</server>
+	<listener type="HyperFastCgi.Listeners.NativeListener">
+		<apphost-transport type="HyperFastCgi.Transports.NativeTransport">
+			<multithreading>Task</multithreading>
+		</apphost-transport>
+		<protocol>Unix</protocol>
+		<address>//666@${ONLYOFFICE_SOCKET}</address>
+	</listener>
+	<apphost type="HyperFastCgi.AppHosts.AspNet.AspNetApplicationHost">
+		<log level="Error" write-to-console="false" />
+		<add-trailing-slash>false</add-trailing-slash>
+	</apphost>
+	<web-applications>
+		<web-application>
+			<name>onlyoffice</name>
+			<vpath>/</vpath>
+			<path>.</path>
+		</web-application>
+	</web-applications> 
+</configuration>
diff --git a/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyofficeApiSystem b/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyofficeApiSystem
new file mode 100644
index 0000000000..2059a6effa
--- /dev/null
+++ b/build/install/snap/src/onlyoffice/config/hyperfastcgi-config/onlyofficeApiSystem
@@ -0,0 +1,24 @@
+<configuration>
+	<server type="HyperFastCgi.ApplicationServers.SimpleApplicationServer">
+		<root-dir>${SNAP}/var/www/onlyoffice/ApiSystem</root-dir>
+		<threads min-worker="40" max-worker="0" min-io="4" max-io="0" />
+	</server>
+	<listener type="HyperFastCgi.Listeners.NativeListener">
+		<apphost-transport type="HyperFastCgi.Transports.NativeTransport">
+			<multithreading>Task</multithreading>
+		</apphost-transport>
+		<protocol>Unix</protocol>
+		<address>//666@${ONLYOFFICE_API_SYSTEM_SOCKET}</address>
+	</listener>
+	<apphost type="HyperFastCgi.AppHosts.AspNet.AspNetApplicationHost">
+		<log level="Error" write-to-console="false" />
+		<add-trailing-slash>false</add-trailing-slash>
+	</apphost>
+	<web-applications>
+		<web-application>
+			<name>onlyofficeApiSystem</name>
+			<vpath>/</vpath>
+			<path>.</path>
+		</web-application>
+	</web-applications> 
+</configuration>
diff --git a/build/install/snap/src/onlyoffice/utilities/monoserve-utilities b/build/install/snap/src/onlyoffice/utilities/monoserve-utilities
new file mode 100755
index 0000000000..8039f88e6d
--- /dev/null
+++ b/build/install/snap/src/onlyoffice/utilities/monoserve-utilities
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+export ONLYOFFICE_SOCKET="/tmp/sockets/onlyoffice.socket"
+export ONLYOFFICE_API_SYSTEM_SOCKET="/tmp/sockets/onlyofficeApiSystem.socket"
+export ONLYOFFICE_CORE_MACHINEKEY_FILE="$SNAP_DATA/onlyoffice/.onlyoffice_core_machine_key"
+
+mkdir -p "$(dirname "$ONLYOFFICE_SOCKET")"
+chmod 750 "$(dirname "$ONLYOFFICE_SOCKET")"
+
+mkdir -p "$(dirname "$ONLYOFFICE_API_SYSTEM_SOCKET")"
+chmod 750 "$(dirname "$ONLYOFFICE_API_SYSTEM_SOCKET")"
+
+mkdir -p "$(dirname "$ONLYOFFICE_CORE_MACHINEKEY_FILE")"
+chmod 750 "$(dirname "$ONLYOFFICE_CORE_MACHINEKEY_FILE")"
+
+mkdir -p $SNAP_DATA/hyperfastcgi
+chmod 750 $SNAP_DATA/hyperfastcgi
+
+mkdir -p $SNAP_DATA/onlyoffice/logs
+chmod 750 $SNAP_DATA/onlyoffice/logs
+
+mkdir -p $SNAP_DATA/onlyoffice/data
+chmod 750 $SNAP_DATA/onlyoffice/data
+
+mkdir -p $SNAP_DATA/onlyoffice/config
+chmod 750 $SNAP_DATA/onlyoffice/config
+
+onlyoffice_get_core_machine_key() {
+	if [ ! -f "$ONLYOFFICE_CORE_MACHINEKEY_FILE" ]; then
+		echo "$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c64)" > ${ONLYOFFICE_CORE_MACHINEKEY_FILE};
+		chmod 600 ${ONLYOFFICE_CORE_MACHINEKEY_FILE};
+	fi
+
+	cat "$ONLYOFFICE_CORE_MACHINEKEY_FILE";
+}
+
diff --git a/build/install/snap/src/patches/support-compile-time-disabling-of-setpriority.patch b/build/install/snap/src/patches/support-compile-time-disabling-of-setpriority.patch
new file mode 100644
index 0000000000..569a01be7a
--- /dev/null
+++ b/build/install/snap/src/patches/support-compile-time-disabling-of-setpriority.patch
@@ -0,0 +1,92 @@
+From bb6c86ca997b2ca1b052cb83e91152220fe149ad Mon Sep 17 00:00:00 2001
+From: Kyle Fazzari <oracle@status.e4ward.com>
+Date: Fri, 25 Mar 2016 15:03:38 +0000
+Subject: [PATCH] Support compile-time disabling of setpriority().
+
+This is to support running on systems such as Snappy Ubuntu Core,
+e.g. heavily confined using seccomp filters. In such a situation,
+without this commit, MySQL is aborted as soon as it tries to call
+setpriority(). With this commit, MySQL can be built without
+setpriority() by using -DWITH_INNODB_PAGE_CLEANER_PRIORITY=OFF,
+thus supporting such systems.
+
+Signed-off-by: Kyle Fazzari <oracle@status.e4ward.com>
+---
+ storage/innobase/buf/buf0flu.cc | 12 ++++++------
+ storage/innobase/innodb.cmake   |  5 +++++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
+index 5a8a3567e0f..0961f757b1a 100644
+--- a/storage/innobase/buf/buf0flu.cc
++++ b/storage/innobase/buf/buf0flu.cc
+@@ -2952,7 +2952,7 @@ pc_wait_finished(
+ 	return(all_succeeded);
+ }
+ 
+-#ifdef UNIV_LINUX
++#if defined(UNIV_LINUX) && defined(SET_PAGE_CLEANER_PRIORITY)
+ /**
+ Set priority for page_cleaner threads.
+ @param[in]	priority	priority intended to set
+@@ -2967,7 +2967,7 @@ buf_flush_page_cleaner_set_priority(
+ 	return(getpriority(PRIO_PROCESS, (pid_t)syscall(SYS_gettid))
+ 	       == priority);
+ }
+-#endif /* UNIV_LINUX */
++#endif /* UNIV_LINUX && SET_PAGE_CLEANER_PRIORITY */
+ 
+ #ifdef UNIV_DEBUG
+ /** Loop used to disable page cleaner threads. */
+@@ -3113,7 +3113,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
+ 		<< os_thread_pf(os_thread_get_curr_id());
+ #endif /* UNIV_DEBUG_THREAD_CREATION */
+ 
+-#ifdef UNIV_LINUX
++#if defined(UNIV_LINUX) && defined(SET_PAGE_CLEANER_PRIORITY)
+ 	/* linux might be able to set different setting for each thread.
+ 	worth to try to set high priority for page cleaner threads */
+ 	if (buf_flush_page_cleaner_set_priority(
+@@ -3126,7 +3126,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
+ 		" page cleaner thread priority can be changed."
+ 		" See the man page of setpriority().";
+ 	}
+-#endif /* UNIV_LINUX */
++#endif /* UNIV_LINUX && SET_PAGE_CLEANER_PRIORITY */
+ 
+ 	buf_page_cleaner_is_active = true;
+ 
+@@ -3481,7 +3481,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_worker)(
+ 	page_cleaner->n_workers++;
+ 	mutex_exit(&page_cleaner->mutex);
+ 
+-#ifdef UNIV_LINUX
++#if defined(UNIV_LINUX) && defined(SET_PAGE_CLEANER_PRIORITY)
+ 	/* linux might be able to set different setting for each thread
+ 	worth to try to set high priority for page cleaner threads */
+ 	if (buf_flush_page_cleaner_set_priority(
+@@ -3490,7 +3490,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_worker)(
+ 		ib::info() << "page_cleaner worker priority: "
+ 			<< buf_flush_page_cleaner_priority;
+ 	}
+-#endif /* UNIV_LINUX */
++#endif /* UNIV_LINUX && SET_PAGE_CLEANER_PRIORITY */
+ 
+ 	while (true) {
+ 		os_event_wait(page_cleaner->is_requested);
+diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake
+index a90fe67f492..0d0a3ad7e3b 100644
+--- a/storage/innobase/innodb.cmake
++++ b/storage/innobase/innodb.cmake
+@@ -38,6 +38,11 @@ IF(UNIX)
+       LINK_LIBRARIES(aio)
+     ENDIF()
+ 
++    OPTION(WITH_INNODB_PAGE_CLEANER_PRIORITY "Set a high priority for page cleaner threads" ON)
++    IF(WITH_INNODB_PAGE_CLEANER_PRIORITY)
++      ADD_DEFINITIONS("-DSET_PAGE_CLEANER_PRIORITY")
++    ENDIF()
++
+   ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+     ADD_DEFINITIONS("-DUNIV_SOLARIS")
+   ENDIF()
diff --git a/build/install/snap/src/redis/bin/start-redis-server b/build/install/snap/src/redis/bin/start-redis-server
new file mode 100755
index 0000000000..5cbc923790
--- /dev/null
+++ b/build/install/snap/src/redis/bin/start-redis-server
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# shellcheck source=src/redis/utilities/redis-utilities
+. "$SNAP/utilities/redis-utilities"
+
+mkdir -p "${SNAP_DATA}/redis"
+chmod 750 "${SNAP_DATA}/redis"
+
+# redis doesn't support environment variables in its config files. Thankfully
+# it supports reading the config file from stdin though, so we'll rewrite the
+# config file on the fly and pipe it in.
+sed -e "s|\${SNAP_DATA}|$SNAP_DATA|;s|\${REDIS_PIDFILE}|$REDIS_PIDFILE|;s|\${REDIS_SOCKET}|$REDIS_SOCKET|" "$SNAP/config/redis/redis.conf" | redis-server -
diff --git a/build/install/snap/src/redis/config/redis.conf b/build/install/snap/src/redis/config/redis.conf
new file mode 100644
index 0000000000..ddeddc6465
--- /dev/null
+++ b/build/install/snap/src/redis/config/redis.conf
@@ -0,0 +1,1023 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./redis-server /path/to/redis.conf
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 0
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket ${REDIS_SOCKET}
+# unixsocketperm 700
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile ${REDIS_PIDFILE}
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile ${SNAP_DATA}/redis/redis.log
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+save 900 1
+save 300 10
+save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ${SNAP_DATA}/redis/
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  of zero or multiple characters. The empty string means that notifications
+#  are disabled.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/build/install/snap/src/redis/utilities/redis-utilities b/build/install/snap/src/redis/utilities/redis-utilities
new file mode 100755
index 0000000000..09645429aa
--- /dev/null
+++ b/build/install/snap/src/redis/utilities/redis-utilities
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+export REDIS_PIDFILE="/tmp/pids/redis.pid"
+export REDIS_SOCKET="/tmp/sockets/redis.sock"
+
+mkdir -p "$(dirname "$REDIS_PIDFILE")"
+mkdir -p "$(dirname "$REDIS_SOCKET")"
+chmod 750 "$(dirname "$REDIS_PIDFILE")"
+chmod 750 "$(dirname "$REDIS_SOCKET")"
+
+redis_is_running()
+{
+	[ -f "$REDIS_PIDFILE" ] && [ -S "$REDIS_SOCKET" ]
+}
+
+wait_for_redis()
+{
+	if ! redis_is_running; then
+		printf "Waiting for redis... "
+		while ! redis_is_running; do
+			sleep 1
+		done
+		printf "done\n"
+	fi
+}
+
+redis_pid()
+{
+	if redis_is_running; then
+		cat "$REDIS_PIDFILE"
+	else
+		echo "Unable to get redis PID as it's not yet running" >&2
+		echo ""
+	fi
+}

From d54ba9f9d39e29c513078d2f8c04d62a35eafbb9 Mon Sep 17 00:00:00 2001
From: NikolayRechkin <nikolaynikcher@gmail.com>
Date: Thu, 5 Sep 2019 09:23:05 +0300
Subject: [PATCH 07/37] web: components: first version of the avatar editor

---
 web/ASC.Web.Components/package.json           |   1 +
 .../src/components/avatar-editor/index.js     | 218 ++++++++++++++++++
 .../src/components/avatar/index.js            |   2 +-
 web/ASC.Web.Components/src/index.js           |   1 +
 web/ASC.Web.Components/yarn.lock              |  12 +
 .../stories/avatar-editor/README.md           |  34 +++
 .../stories/avatar-editor/index.stories.js    |  72 ++++++
 7 files changed, 339 insertions(+), 1 deletion(-)
 create mode 100644 web/ASC.Web.Components/src/components/avatar-editor/index.js
 create mode 100644 web/ASC.Web.Storybook/stories/avatar-editor/README.md
 create mode 100644 web/ASC.Web.Storybook/stories/avatar-editor/index.stories.js

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index f666302a47..791343b521 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -33,6 +33,7 @@
     "prop-types": "^15.7.2",
     "rc-tree": "^2.1.2",
     "react-autosize-textarea": "^7.0.0",
+    "react-avatar-edit": "^0.8.3",
     "react-custom-scrollbars": "^4.2.1",
     "react-datepicker": "^2.8.0",
     "react-lifecycles-compat": "^3.0.4",
diff --git a/web/ASC.Web.Components/src/components/avatar-editor/index.js b/web/ASC.Web.Components/src/components/avatar-editor/index.js
new file mode 100644
index 0000000000..d5707524b7
--- /dev/null
+++ b/web/ASC.Web.Components/src/components/avatar-editor/index.js
@@ -0,0 +1,218 @@
+import React, { memo } from 'react'
+import styled, { css } from 'styled-components'
+import PropTypes from 'prop-types'
+import ModalDialog from '../modal-dialog'
+import Button from '../button'
+import { Text } from '../text'
+import Avatar from 'react-avatar-edit'
+import { default as ASCAvatar } from '../avatar/index'
+
+const StyledASCAvatar = styled(ASCAvatar)`
+    display: inline-block;
+    vertical-align: bottom;
+`;
+const StyledAvatarContainer = styled.div`
+    text-align: center;
+    div:first-child {
+        margin: 0 auto;
+    }
+`;
+class AvatarEditorBody extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            croppedImage: null,
+            src: this.props.image,
+            hasMaxSizeError: false
+        }
+        this.onCrop = this.onCrop.bind(this)
+        this.onClose = this.onClose.bind(this)
+        this.onBeforeFileLoad = this.onBeforeFileLoad.bind(this)
+        this.onFileLoad = this.onFileLoad.bind(this)
+
+    }
+    onClose() {
+        this.props.onCloseEditor();
+        this.setState({ croppedImage: null })
+    }
+    onCrop(croppedImage) {
+        this.props.onCropImage(croppedImage);
+        this.setState({ croppedImage })
+    }
+    onBeforeFileLoad(elem) {
+        if (elem.target.files[0].size > this.props.maxSize * 1000000) {
+            this.setState({
+                hasMaxSizeError: true
+            });
+            elem.target.value = "";
+        }else if(this.state.hasMaxSizeError){
+            this.setState({
+                hasMaxSizeError: false
+            });
+        };
+    }
+    onFileLoad(file){
+        let reader = new FileReader();
+        let _this = this;
+        reader.onloadend = () => {
+            _this.props.onFileLoad(reader.result);
+        };
+        reader.readAsDataURL(file)
+    }
+    render() {
+        return (
+            <StyledAvatarContainer>
+                <Avatar
+                    width={400}
+                    height={295}
+                    imageWidth={400}
+                    cropRadius={50}
+                    onCrop={this.onCrop}
+                    onClose={this.onClose}
+                    onBeforeFileLoad={this.onBeforeFileLoad}
+                    onFileLoad={this.onFileLoad}
+                    label={this.props.label}
+                    src={this.state.src}
+                />
+                {this.state.croppedImage && (
+                    <div>
+                        <StyledASCAvatar
+                            size='max'
+                            role='user'
+                            source={this.state.croppedImage}
+                            editing={false}
+                        />
+                        <StyledASCAvatar
+                            size='big'
+                            role='user'
+                            source={this.state.croppedImage}
+                            editing={false}
+                        />
+                    </div>
+                    )
+                }
+                {
+                    this.state.hasMaxSizeError &&
+                    <Text.Body as='span' color="#ED7309" isBold={true}>
+                        {this.props.maxSizeErrorLabel}
+                    </Text.Body>
+                }
+            </StyledAvatarContainer>
+        );
+    }
+}
+
+class AvatarEditor extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            defaultImage: null,
+            croppedImage: null,
+            visible: props.value
+        };
+
+        this.onClose = this.onClose.bind(this);
+
+        this.onCropImage = this.onCropImage.bind(this);
+        this.onCloseEditor = this.onCloseEditor.bind(this);
+
+        this.onFileLoad = this.onFileLoad.bind(this);
+        this.onSaveButtonClick = this.onSaveButtonClick.bind(this);
+
+    }
+    onFileLoad(file){
+        this.setState({ defaultImage: file });
+    }
+    onSaveButtonClick() {
+        this.props.onSave({
+            defaultImage: this.state.defaultImage,
+            croppedImage: this.state.croppedImage
+        });
+        this.setState({ visible: false });
+    }
+    onCloseEditor() {
+        this.setState({
+            croppedImage: null
+        });
+    }
+    onCropImage(result) {
+        this.setState({
+            croppedImage: result
+        });
+    }
+
+    onClose() {
+        this.setState({ visible: false });
+        this.props.onClose();
+    }
+
+    componentDidUpdate(prevProps) {
+        if (this.props.visible !== prevProps.visible) {
+            this.setState({ visible: this.props.visible });
+        }
+    }
+    render() {
+        return (
+            <ModalDialog
+                visible={this.state.visible}
+                headerContent={this.props.headerLabel}
+                bodyContent={
+                    <AvatarEditorBody
+                        maxSize={this.props.maxSize}
+                        image={this.props.image}
+                        onCropImage={this.onCropImage}
+                        onCloseEditor={this.onCloseEditor}
+                        label={this.props.chooseFileLabel}
+                        maxSizeErrorLabel={this.props.maxSizeErrorLabel}
+                        onFileLoad={this.onFileLoad}
+                    />
+                }
+                footerContent={[
+                    <Button
+                        key="SaveBtn"
+                        label={this.props.saveButtonLabel}
+                        primary={true}
+                        onClick={this.onSaveButtonClick}
+                    />,
+                    <Button
+                        key="CancelBtn"
+                        label={this.props.cancelButtonLabel}
+                        onClick={this.onClose}
+                        style={{ marginLeft: "8px" }}
+                    />
+                ]}
+                onClose={this.props.onClose}
+            />
+        );
+    }
+}
+
+AvatarEditor.propTypes = {
+    visible: PropTypes.bool,
+    headerLabel: PropTypes.string,
+    chooseFileLabel: PropTypes.string,
+    saveButtonLabel: PropTypes.string,
+    maxSizeErrorLabel: PropTypes.string,
+    image: PropTypes.string,
+    cancelButtonLabel: PropTypes.string,
+    maxSize: PropTypes.number,
+
+    onSave: PropTypes.func,
+    onClose: PropTypes.func
+};
+
+AvatarEditor.defaultProps = {
+    visible: false,
+    maxSize: 1, //1MB
+    chooseFileLabel: 'Choose a file',
+    headerLabel: 'Edit Photo',
+    saveButtonLabel: 'Save',
+    cancelButtonLabel: 'Cancel',
+    maxSizeErrorLabel: 'File is too big'
+};
+
+export default AvatarEditor;
+
+
diff --git a/web/ASC.Web.Components/src/components/avatar/index.js b/web/ASC.Web.Components/src/components/avatar/index.js
index 11b2162bc8..d77036f500 100644
--- a/web/ASC.Web.Components/src/components/avatar/index.js
+++ b/web/ASC.Web.Components/src/components/avatar/index.js
@@ -56,7 +56,7 @@ const RoleWrapper = styled.div`
 `;
 
 const ImageStyled = styled.img`
-    max-width: 100%; 
+    width: 100%; 
     height: auto;
     border-radius: 50%;
 
diff --git a/web/ASC.Web.Components/src/index.js b/web/ASC.Web.Components/src/index.js
index b8098ef914..9f0ce8a7ce 100644
--- a/web/ASC.Web.Components/src/index.js
+++ b/web/ASC.Web.Components/src/index.js
@@ -12,6 +12,7 @@ export { default as GroupButtonsMenu } from './components/group-buttons-menu'
 export { default as TreeMenu } from './components/tree-menu'
 export { default as TreeNode } from './components/tree-menu-node'
 export { default as Avatar } from './components/avatar'
+export { default as AvatarEditor } from './components/avatar-editor'
 export { default as RequestLoader } from './components/request-loader'
 export { default as MainButton } from './components/main-button'
 export { default as ContextMenuButton } from './components/context-menu-button'
diff --git a/web/ASC.Web.Components/yarn.lock b/web/ASC.Web.Components/yarn.lock
index d2644473c9..ee2dedadc5 100644
--- a/web/ASC.Web.Components/yarn.lock
+++ b/web/ASC.Web.Components/yarn.lock
@@ -4976,6 +4976,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+konva@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/konva/-/konva-2.5.1.tgz#cca611a9522e831e54cf57c508a1aed3f0ceac25"
+  integrity sha512-YdHEWqmbWPieqIZuLx7JFGm9Ui08hSUaSJ2k2Ml8o5giFgJ0WmxAS0DPXIM+Ty2ADRagOHZfXSJ/skwYqqlwgQ==
+
 lazy-cache@^0.2.3:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
@@ -6777,6 +6782,13 @@ react-autosize-textarea@^7.0.0:
     line-height "^0.3.1"
     prop-types "^15.5.6"
 
+react-avatar-edit@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/react-avatar-edit/-/react-avatar-edit-0.8.3.tgz#0ebf21391328fc255429bdfbc782f795827109bf"
+  integrity sha512-QEedh6DjDCSI7AUsUHHtfhxApCWC5hJAoywxUA5PtUdw03iIjEurgVqPOIt1UBHhU/Zk/9amElRF3oepN9JZSg==
+  dependencies:
+    konva "2.5.1"
+
 react-custom-scrollbars@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz#830fd9502927e97e8a78c2086813899b2a8b66db"
diff --git a/web/ASC.Web.Storybook/stories/avatar-editor/README.md b/web/ASC.Web.Storybook/stories/avatar-editor/README.md
new file mode 100644
index 0000000000..c98e2d967f
--- /dev/null
+++ b/web/ASC.Web.Storybook/stories/avatar-editor/README.md
@@ -0,0 +1,34 @@
+# Avatar Editor
+
+## Usage
+
+```js
+import { AvatarEditor } from 'asc-web-components';
+```
+
+#### Description
+
+Required to display user avatar editor on page.
+
+#### Usage
+
+```js
+<AvatarEditor
+  visible={true}
+  onSave={(data) =>{console.log(data.croppedImage, data.defaultImage)}}
+/>
+```
+
+#### Properties
+
+| Props                | Type       | Required | Values                                    | Default            | Description                                           |
+| ------------------   | --------   | :------: | ----------------------------------------- | ------------------ | ----------------------------------------------------- |
+| `visible`            | `bool`     |    -     |                                           | `false`            | Display avatar editor or not                          |
+| `chooseFileLabel`    | `string`   |    -     |                                           | `Choose a file`    |                                                       |
+| `headerLabel`        | `string`   |    -     |                                           | `Edit Photo`       |                                                       |
+| `saveButtonLabel`    | `string`   |    -     |                                           | `Save`             |                                                       |
+| `cancelButtonLabel`  | `string`   |    -     |                                           | `Cancel`           |                                                       |
+| `maxSizeErrorLabel`  | `string`   |    -     |                                           | `File is too big`  |                                                       |
+| `maxSize`            | `number`   |    -     |                                           | `1`                | Max size of image                                     |
+| `onSave`             | `function` |    -     |                                           |                    |                                                       |
+| `onClose`            | `function` |    -     |                                           |                    |                                                       |
\ No newline at end of file
diff --git a/web/ASC.Web.Storybook/stories/avatar-editor/index.stories.js b/web/ASC.Web.Storybook/stories/avatar-editor/index.stories.js
new file mode 100644
index 0000000000..215d8db8b1
--- /dev/null
+++ b/web/ASC.Web.Storybook/stories/avatar-editor/index.stories.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { withKnobs, boolean, text, select } from '@storybook/addon-knobs/react';
+import withReadme from 'storybook-readme/with-readme';
+import Readme from './README.md';
+import { AvatarEditor, Avatar } from 'asc-web-components';
+import Section from '../../.storybook/decorators/section';
+
+class AvatarEditorStory extends React.Component  {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      isOpen: false,
+      userImage: null
+    }
+
+    this.openEditor = this.openEditor.bind(this);
+    this.onClose = this.onClose.bind(this);
+    this.onSave = this.onSave.bind(this);
+    
+  }
+  onSave(result){
+    action('onSave')(result);
+    this.setState({
+      userImage: result.croppedImage,
+      isOpen: false
+    })
+  }
+  openEditor(){
+    this.setState({
+      isOpen: true
+    })
+  }
+  onClose(){
+    action('onClose');
+    this.setState({
+      isOpen: false
+    })
+  }
+  render(){
+    return(
+      <div>
+        <Avatar
+            size='max'
+            role='user'
+            source={this.state.userImage }
+            editing={true}
+            editAction={this.openEditor}
+        />
+        <AvatarEditor
+          visible={this.state.isOpen}
+          onClose={this.onClose}
+          onSave={this.onSave}
+        />
+      </div>
+    )
+  }
+}
+
+storiesOf('Components|AvatarEditor', module)
+  .addDecorator(withKnobs)
+  .addDecorator(withReadme(Readme))
+  .add('avatar editor', () => {
+   
+    return (
+      <Section>
+        <AvatarEditorStory />
+    </Section>
+    );
+  });
\ No newline at end of file

From 0ac7dbc86072d24528792f82dc6168fc9da8f97a Mon Sep 17 00:00:00 2001
From: NikolayRechkin <nikolaynikcher@gmail.com>
Date: Thu, 5 Sep 2019 09:43:26 +0300
Subject: [PATCH 08/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index d7a891337d..31d21b8533 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From bbcfe26e31d133f774abf9f2ab61da81eb046a8e Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 10:20:12 +0300
Subject: [PATCH 09/37] web: Components: Added PasswordInput component.

---
 .../src/components/password-input/index.js    | 373 ++++++++++++++++++
 web/ASC.Web.Components/src/index.js           |   1 +
 .../stories/input/password/README.md          |  78 ++++
 .../stories/input/password/index.stories.js   |  66 ++++
 4 files changed, 518 insertions(+)
 create mode 100644 web/ASC.Web.Components/src/components/password-input/index.js
 create mode 100644 web/ASC.Web.Storybook/stories/input/password/README.md
 create mode 100644 web/ASC.Web.Storybook/stories/input/password/index.stories.js

diff --git a/web/ASC.Web.Components/src/components/password-input/index.js b/web/ASC.Web.Components/src/components/password-input/index.js
new file mode 100644
index 0000000000..08d2376535
--- /dev/null
+++ b/web/ASC.Web.Components/src/components/password-input/index.js
@@ -0,0 +1,373 @@
+import React from 'react'
+import styled from 'styled-components'
+import PropTypes from 'prop-types'
+
+import { tablet } from '../../utils/device';
+import InputBlock from '../input-block'
+import { Icons } from '../icons'
+import Link from '../link'
+import { Text } from '../text'
+import DropDown from '../drop-down'
+
+const StyledInput = styled.div`
+  display: flex;
+  align-items: center;
+  line-height: 32px;
+  flex-direction: row;
+  flex-wrap: nowrap;
+
+  @media ${tablet} {
+    flex-wrap: wrap;
+  } 
+`;
+
+const PasswordProgress = styled.div`
+  ${props => props.inputWidth ? `width: ${props.inputWidth};` : `flex: auto;`}
+`;
+
+const NewPasswordButton = styled.div`
+  margin-left: 16px;
+  margin-top: -6px;
+`;
+
+const CopyLink = styled.div`
+  margin-top: -6px;
+  margin-left: 16px;
+
+  @media ${tablet} {
+    width: 100%;
+    margin-left: 0px;
+    margin-top: 8px;
+  }
+`;
+
+const Progress = styled.div`
+  border: 3px solid ${props => (!props.isDisabled && props.progressColor) ? props.progressColor : 'transparent'};
+  border-radius: 2px;
+  margin-top: -4px;
+  width: ${props => props.progressWidth ? props.progressWidth + '%' : '0%'};
+`;
+
+const StyledTooltipContainer = styled(Text.Body)`
+  margin: 8px 16px 16px 16px;
+`;
+
+const StyledTooltipItem = styled(Text.Body)`
+  margin-left: 8px;
+  height: 24px;
+  color: ${props => props.valid ? '#44bb00' : '#B40404'};
+`;
+
+class PasswordInput extends React.PureComponent {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      type: props.inputType,
+      progressColor: 'transparent',
+      progressWidth: 0,
+      inputValue: '',
+      displayTooltip: false,
+      validLength: false,
+      validDigits: false,
+      validCapital: false,
+      validSpecial: false
+    }
+  }
+
+  onFocus = () => {
+    this.setState({
+      displayTooltip: true
+    });
+  }
+
+  onBlur = () => {
+    this.setState({
+      displayTooltip: false
+    });
+  }
+
+  changeInputType = () => {
+    const newType = this.state.type === 'text' ? 'password' : 'text';
+
+    this.setState({
+      type: newType
+    });
+  }
+
+  testStrength = value => {
+    const { generatorSpecial, passwordSettings } = this.props;
+    const specSymbols = new RegExp('[' + generatorSpecial + ']');
+
+    let capital;
+    let digits;
+    let special;
+
+    passwordSettings.upperCase
+      ? capital = /[A-Z]/.test(value)
+      : capital = true;
+
+    passwordSettings.digits
+      ? digits = /\d/.test(value)
+      : digits = true;
+
+    passwordSettings.specSymbols
+      ? special = specSymbols.test(value)
+      : special = true;
+
+    return {
+      digits: digits,
+      capital: capital,
+      special: special,
+      length: value.length >= passwordSettings.minLength
+    };
+  }
+
+  checkPassword = (value) => {
+    const greenColor = '#44bb00';
+    const redColor = '#B40404';
+    const passwordValidation = this.testStrength(value);
+    const progressScore = passwordValidation.digits
+      && passwordValidation.capital
+      && passwordValidation.special
+      && passwordValidation.length;
+    const progressWidth = value.length * 100 / this.props.passwordSettings.minLength;
+    const progressColor = progressScore
+      ? greenColor
+      : (value.length === 0)
+        ? 'transparent'
+        : redColor;
+
+    this.setState({
+      progressColor: progressColor,
+      progressWidth: progressWidth > 100 ? 100 : progressWidth,
+      inputValue: value,
+      validLength: passwordValidation.length,
+      validDigits: passwordValidation.digits,
+      validCapital: passwordValidation.capital,
+      validSpecial: passwordValidation.special
+    });
+  }
+
+  onChangeAction = (e) => {
+    this.props.onChange && this.props.onChange(e);
+    this.checkPassword(e.target.value);
+  }
+
+  onGeneratePassword = (e) => {
+    if (this.props.isDisabled)
+      return e.preventDefault();
+
+    const newPassword = this.getNewPassword();
+    this.checkPassword(newPassword);
+  }
+
+  getNewPassword = () => {
+    const { passwordSettings, generatorSpecial } = this.props;
+
+    const length = passwordSettings.minLength;
+    const string = 'abcdefghijklmnopqrstuvwxyz';
+    const numeric = '0123456789';
+    const special = generatorSpecial;
+
+    let password = '';
+    let character = '';
+
+    while (password.length < length) {
+      const a = Math.ceil(string.length * Math.random() * Math.random());
+      const b = Math.ceil(numeric.length * Math.random() * Math.random());
+      const c = Math.ceil(special.length * Math.random() * Math.random());
+
+      let hold = string.charAt(a);
+
+      if (passwordSettings.upperCase) {
+        hold = (password.length % 2 == 0)
+        ? (hold.toUpperCase())
+        : (hold);
+      }
+
+      character += hold;
+      
+      if (passwordSettings.digits) {
+        character += numeric.charAt(b);
+      }
+
+      if (passwordSettings.specSymbols) {
+        character += special.charAt(c);
+      }
+          
+      password = character;
+    }
+
+    password = password
+      .split('')
+      .sort(() => 0.5 - Math.random())
+      .join('');
+
+    return password.substr(0, length);
+  }
+
+  copyToClipboard = emailInputName => {
+    const { clipEmailResource, clipPasswordResource, isDisabled } = this.props;
+
+    if (isDisabled)
+      return event.preventDefault();
+
+    const textField = document.createElement('textarea');
+    const emailValue = document.getElementsByName(emailInputName)[0].value;
+
+    textField.innerText = clipEmailResource + emailValue + ' | ' + clipPasswordResource + this.state.inputValue;
+
+    document.body.appendChild(textField);
+    textField.select();
+    document.execCommand('copy');
+    textField.remove();
+  }
+
+  render() {
+    const {
+      inputName,
+      isDisabled,
+      scale,
+      size,
+      clipActionResource,
+      tooltipPasswordTitle,
+      tooltipPasswordLength,
+      tooltipPasswordDigits,
+      tooltipPasswordCapital,
+      tooltipPasswordSpecial,
+      emailInputName,
+      inputWidth,
+      passwordSettings
+    } = this.props;
+    const {
+      type,
+      progressColor,
+      progressWidth,
+      inputValue,
+      validLength,
+      validDigits,
+      validCapital,
+      validSpecial,
+      displayTooltip
+    } = this.state;
+
+    const iconsColor = isDisabled ? '#D0D5DA' : '#A3A9AE';
+
+    const tooltipContent = (
+      <StyledTooltipContainer forwardedAs='div' title={tooltipPasswordTitle}>
+        {tooltipPasswordTitle}
+        <StyledTooltipItem forwardedAs='div' title={tooltipPasswordLength} valid={validLength} >
+          {tooltipPasswordLength}
+        </StyledTooltipItem>
+        {passwordSettings.digits &&
+          <StyledTooltipItem forwardedAs='div' title={tooltipPasswordDigits} valid={validDigits} >
+            {tooltipPasswordDigits}
+          </StyledTooltipItem>
+        }
+        {passwordSettings.upperCase &&
+        <StyledTooltipItem forwardedAs='div' title={tooltipPasswordCapital} valid={validCapital} >
+          {tooltipPasswordCapital}
+        </StyledTooltipItem>
+        }
+        {passwordSettings.specSymbols &&
+        <StyledTooltipItem forwardedAs='div' title={tooltipPasswordSpecial} valid={validSpecial} >
+          {tooltipPasswordSpecial}
+        </StyledTooltipItem>
+        }
+      </StyledTooltipContainer>
+    );
+
+    return (
+      <StyledInput>
+        <PasswordProgress inputWidth={inputWidth}>
+          <InputBlock
+            name={inputName}
+            hasError={false}
+            isDisabled={isDisabled}
+            iconName='EyeIcon'
+            value={inputValue}
+            onIconClick={this.changeInputType}
+            onChange={this.onChangeAction}
+            scale={scale}
+            size={size}
+            type={type}
+            iconColor={iconsColor}
+            isIconFill={true}
+            onFocus={this.onFocus}
+            onBlur={this.onBlur}
+          >
+            {displayTooltip &&
+              <DropDown directionY='top' manualY='150%' isOpen={true}>
+                {tooltipContent}
+              </DropDown>
+            }
+          </InputBlock>
+          <Progress progressColor={progressColor} progressWidth={progressWidth} isDisabled={isDisabled} />
+        </PasswordProgress>
+        <NewPasswordButton>
+          <Icons.RefreshIcon
+            size="medium"
+            color={iconsColor}
+            isfill={true}
+            onClick={this.onGeneratePassword}
+          />
+        </NewPasswordButton>
+        <CopyLink>
+          <Link
+            type="action"
+            isHovered={true}
+            fontSize={13}
+            color={iconsColor}
+            onClick={this.copyToClipboard.bind(this, emailInputName)}
+          >
+            {clipActionResource}
+          </Link>
+        </CopyLink>
+      </StyledInput>
+    );
+  };
+};
+
+PasswordInput.propTypes = {
+  inputType: PropTypes.oneOf(['text', 'password']),
+  inputName: PropTypes.string,
+  emailInputName: PropTypes.string.isRequired,
+  inputValue: PropTypes.string,
+  onChange: PropTypes.func,
+
+  isDisabled: PropTypes.bool,
+  size: PropTypes.oneOf(['base', 'middle', 'big', 'huge']),
+  scale: PropTypes.bool,
+
+  clipActionResource: PropTypes.string,
+  clipEmailResource: PropTypes.string,
+  clipPasswordResource: PropTypes.string,
+
+  tooltipPasswordTitle: PropTypes.string,
+  tooltipPasswordLength: PropTypes.string,
+  tooltipPasswordDigits: PropTypes.string,
+  tooltipPasswordCapital: PropTypes.string,
+  tooltipPasswordSpecial: PropTypes.string,
+
+  generatorSpecial: PropTypes.string,
+  passwordSettings: PropTypes.object.isRequired
+
+}
+
+PasswordInput.defaultProps = {
+  inputType: 'password',
+  inputName: 'passwordInput',
+
+  size: 'base',
+  scale: true,
+
+  clipEmailResource: 'E-mail',
+  clipPasswordResource: 'Password',
+
+  generatorSpecial: '!@#$%^&*'
+
+}
+
+export default PasswordInput;
\ No newline at end of file
diff --git a/web/ASC.Web.Components/src/index.js b/web/ASC.Web.Components/src/index.js
index 3b140350f8..ed41d6a1a0 100644
--- a/web/ASC.Web.Components/src/index.js
+++ b/web/ASC.Web.Components/src/index.js
@@ -55,3 +55,4 @@ export { default as RowContainer } from './components/row-container'
 export { default as FieldContainer } from './components/field-container'
 export { default as utils } from './utils'
 export { default as DatePicker } from './components/calendar-new/date-input'
+export { default as PasswordInput } from './components/password-input'
diff --git a/web/ASC.Web.Storybook/stories/input/password/README.md b/web/ASC.Web.Storybook/stories/input/password/README.md
new file mode 100644
index 0000000000..03fc778329
--- /dev/null
+++ b/web/ASC.Web.Storybook/stories/input/password/README.md
@@ -0,0 +1,78 @@
+# PasswordInput
+
+#### Description
+
+Password entry field with advanced capabilities for displaying, validation of correspondence and generation based on settings.
+
+Object with settings:
+
+```js
+{
+  minLength: 6,
+  upperCase: false,
+  digits: false,
+  specSymbols: false
+}
+```
+
+Check for compliance with settings is carried out on fly. As you type in required number of characters, progress bar will fill up and when all conditions are met, the color will change from red to green.
+
+Depending on screen width of device, input will change location of elements.
+
+When setting focus to input, tooltip will be shown with progress in fulfilling conditions specified in settings. When unfocused, tooltip disappears.
+
+#### Usage
+
+```js
+import { PasswordInput } from "asc-web-components";
+
+const settings = {
+  minLength: 6,
+  upperCase: false,
+  digits: false,
+  specSymbols: false
+};
+
+<PasswordInput
+  inputName="demoPasswordInput"
+  emailInputName="demoEmailInput"
+  inputValue={value}
+  onChange={e => {
+    set(e.target.value);
+  }}
+  clipActionResource="Copy e-mail and password"
+  clipEmailResource="E-mail: "
+  clipPasswordResource="Password: "
+  tooltipPasswordTitle="Password must contain:"
+  tooltipPasswordLength="from 6 to 30 characters"
+  tooltipPasswordDigits="digits"
+  tooltipPasswordCapital="capital letters"
+  tooltipPasswordSpecial="special characters (!@#$%^&*)"
+  generatorSpecial="!@#$%^&*"
+  passwordSettings={settings}
+  isDisabled={false}
+/>;
+```
+
+#### Properties
+
+| Props               | Type      | Required | Values             | Default   | Description                                               |
+| ------------------- | --------- | :------: | ------------------ | --------- | --------------------------------------------------------- |
+| `inputType`         | `array`   |    -     | `text`, `password` | `password`| It is necessary for correct display of values ​​inside input|
+| `inputName`         | `string`  |    -     | -                  | `passwordInput`| Input name                                           |
+| `emailInputName`    | `string`  |    ✅    | -                  | -         | Required to associate password field with email field     |
+| `inputValue`        | `string`  |    -     | -                  | -         | Input value                                               |
+| `onChange`          | `func`    |    -     | -                  | -         | Will be triggered whenever an PasswordInput typing        |
+| `clipActionResource`| `string`  |    -     | -                  | -         | Translation of text for copying email data and password   |
+| `clipEmailResource` | `string`  |    -     | -                  | `E-mail`  | Text translation email to copy                            |
+| `clipPasswordResource`| `string`  |  -     | -                  | `Password`| Text translation password to copy                         |
+| `tooltipPasswordTitle`| `string`  |  -     | -                  | -         | Text translation tooltip                                  |
+| `tooltipPasswordLength`| `string`  | -     | -                  | -         | Password text translation is long tooltip                 |
+| `tooltipPasswordDigits`| `string`  | -     | -                  | -         | Digit text translation tooltip                            |
+| `tooltipPasswordCapital`| `string`  |-     | -                  | -         | Capital text translation tooltip                          |
+| `tooltipPasswordSpecial`| `string`  |-     | -                  | -         | Special text translation tooltip                          |
+| `generatorSpecial`  | `string`  |    -     | -                  | `!@#$%^&*`| Set of special characters for password generator and validator|
+| `passwordSettings`  | `object`  |    ✅    | -                  | -         | Set of settings for password generator and validator      |
+| `isDisabled`        | `bool`    |    -     | -                  | `false`   | Set input disabled                                        |
+| `inputWidth`        | `string`  |    -     | -                  | -         | If you need to set input width manually                   |
+
diff --git a/web/ASC.Web.Storybook/stories/input/password/index.stories.js b/web/ASC.Web.Storybook/stories/input/password/index.stories.js
new file mode 100644
index 0000000000..d84e70cbc8
--- /dev/null
+++ b/web/ASC.Web.Storybook/stories/input/password/index.stories.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { StringValue } from 'react-values';
+import { withKnobs, boolean, text, select, number } from '@storybook/addon-knobs/react';
+import withReadme from 'storybook-readme/with-readme';
+import Readme from './README.md';
+import { PasswordInput, TextInput } from 'asc-web-components';
+import Section from '../../../.storybook/decorators/section';
+
+storiesOf('Components|Input', module)
+  .addDecorator(withKnobs)
+  .addDecorator(withReadme(Readme))
+  .add('advanced password', () => {
+    const isDisabled = boolean('isDisabled', false);
+    const settingsUpperCase = boolean('settingsUpperCase', false);
+    const settingsDigits = boolean('settingsDigits', false);
+    const settingsSpecSymbols = boolean('settingsSpecSymbols', false);
+
+    const fakeSettings = {
+      minLength: 6,
+      upperCase: settingsUpperCase,
+      digits: settingsDigits,
+      specSymbols: settingsSpecSymbols
+    };
+
+    const tooltipPasswordLength = 'from ' + fakeSettings.minLength + ' to 30 characters';
+
+    return (
+      <Section>
+        <div style={{height: '110px'}}></div> 
+        <TextInput
+          name='demoEmailInput'
+          size='base'
+          isDisabled={isDisabled}
+          isReadOnly={true}
+          scale={true}
+          value='demo@gmail.com'
+        />
+        <br />
+        <StringValue>
+          {({ value, set }) => (
+            <PasswordInput
+              inputName='demoPasswordInput'
+              emailInputName='demoEmailInput'
+              inputValue={value}
+              onChange={e => {
+                set(e.target.value);
+              }}
+              clipActionResource='Copy e-mail and password'
+              clipEmailResource='E-mail: '
+              clipPasswordResource='Password: '
+              tooltipPasswordTitle='Password must contain:'
+              tooltipPasswordLength={tooltipPasswordLength}
+              tooltipPasswordDigits='digits'
+              tooltipPasswordCapital='capital letters'
+              tooltipPasswordSpecial='special characters (!@#$%^&*)'
+              generatorSpecial='!@#$%^&*'
+              passwordSettings={fakeSettings}
+              isDisabled={isDisabled}
+            />
+          )}
+        </StringValue>
+      </Section>
+    )
+  });
\ No newline at end of file

From 4f1f219e9c02fe66be6363cc969419c59e08419f Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 10:20:57 +0300
Subject: [PATCH 10/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 31d21b8533..b68906c145 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From 8bdb9bb39bca83b1e7b1c887db031d26fdb6aec3 Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Thu, 5 Sep 2019 12:00:48 +0300
Subject: [PATCH 11/37] ASC.Web.Components: fix styles in ModalDialog component

---
 .../src/components/modal-dialog/index.js      | 115 +++++++++---------
 .../stories/modal-dialog/README.md            |   2 +-
 .../modal-dialog/modal-dialog.stories.js      |  18 +--
 3 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/web/ASC.Web.Components/src/components/modal-dialog/index.js b/web/ASC.Web.Components/src/components/modal-dialog/index.js
index 45a81927f6..5327afdbbe 100644
--- a/web/ASC.Web.Components/src/components/modal-dialog/index.js
+++ b/web/ASC.Web.Components/src/components/modal-dialog/index.js
@@ -2,74 +2,69 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
 import Backdrop from '../backdrop'
-
-const Header = styled.div`
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  padding: 1rem;
-  border-bottom: 1px solid #dee2e6;
-  border-top-left-radius: .3rem;
-  border-top-right-radius: .3rem;
-`;
-
-const HeaderTitle = styled.div`
-  font-size: 1.5rem;
-`;
-
-const CloseButton = styled.button`
-  background-color: transparent;
-  border: 0;
-  padding: 1rem;
-  margin: -1rem -1rem -1rem auto;
-  font-size: 1.5rem;
-  font-weight: 700;
-  line-height: 1;
-
-  &:focus {
-    outline: none;
-  }
-`;
-
-const Body = styled.div`
-  position: relative;
-  flex: 1 1 auto;
-  padding: 1rem;
-`;
-
-const Footer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  padding: 1rem;
-  border-top: 1px solid #dee2e6;
-  border-bottom-right-radius: .3rem;
-  border-bottom-left-radius: .3rem;
-`;
-
-const Content = styled.div`
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  pointer-events: auto;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid rgba(0,0,0,.2);
-  border-radius: .3rem;
-  outline: 0;
-`;
+import { Text } from '../text'
 
 const Dialog = styled.div`
   position: relative;
   width: auto;
-  max-width: 500px;
+  max-width: 560px;
   margin: 0 auto;
   display: flex;
   align-items: center;
   min-height: 100%;
 `;
 
+const Content = styled.div`
+  position: relative;
+  width: 100%;
+  background-color: #fff;
+  padding: 0 16px 16px;
+`;
+
+const Header = styled.div`
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #dee2e6;
+`;
+
+const HeaderText = styled(Text.ContentHeader)`
+  max-width: 500px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+const CloseButton = styled.a`
+  cursor: pointer;
+  position: absolute;
+  right: 16px;
+  top: 20px;
+  width: 16px;
+  height: 16px;
+
+  &:before, &:after {
+    position: absolute;
+    left: 8px;
+    content: ' ';
+    height: 16px;
+    width: 1px;
+    background-color: #D8D8D8;
+  }
+  &:before {
+    transform: rotate(45deg);
+  }
+  &:after {
+    transform: rotate(-45deg);
+  }
+`;
+
+const Body = styled.div`
+  position: relative;
+  padding: 16px 0;
+`;
+
+const Footer = styled.div``;
+
 const ModalDialog = props => {
   //console.log("ModalDialog render");
   const { visible, headerContent, bodyContent, footerContent, onClose } = props;
@@ -80,8 +75,8 @@ const ModalDialog = props => {
         <Dialog>
           <Content>
             <Header>
-              <HeaderTitle>{headerContent}</HeaderTitle>
-              <CloseButton onClick={onClose}>×</CloseButton>
+              <HeaderText>{headerContent}</HeaderText>
+              <CloseButton onClick={onClose}></CloseButton>
             </Header>
             <Body>{bodyContent}</Body>
             <Footer>{footerContent}</Footer>
diff --git a/web/ASC.Web.Storybook/stories/modal-dialog/README.md b/web/ASC.Web.Storybook/stories/modal-dialog/README.md
index 34773c3247..fe3c045ae1 100644
--- a/web/ASC.Web.Storybook/stories/modal-dialog/README.md
+++ b/web/ASC.Web.Storybook/stories/modal-dialog/README.md
@@ -16,7 +16,7 @@ import { ModalDialog } from 'asc-web-components';
 
 | Props           | Type                      | Required | Values | Default | Description                                      |
 | --------------- | ------------------------- | :------: | -------| ------- | ------------------------------------------------ |
-| `visible`        | `bool`                    |          |        |         | Display dialog or not                            |
+| `visible`       | `bool`                    |          |        |         | Display dialog or not                            |
 | `headerContent` | `string/element/elements` |          |        |         | Header content                                   |
 | `bodyContent`   | `string/element/elements` |          |        |         | Body content                                     |
 | `footerContent` | `string/element/elements` |          |        |         | Footer content                                   |
diff --git a/web/ASC.Web.Storybook/stories/modal-dialog/modal-dialog.stories.js b/web/ASC.Web.Storybook/stories/modal-dialog/modal-dialog.stories.js
index a50a3c135d..bc75d1ea0b 100644
--- a/web/ASC.Web.Storybook/stories/modal-dialog/modal-dialog.stories.js
+++ b/web/ASC.Web.Storybook/stories/modal-dialog/modal-dialog.stories.js
@@ -25,28 +25,20 @@ storiesOf('Components|ModalDialog', module)
             />
             <ModalDialog
               visible={value}
-              headerContent={"Header text"}
+              headerContent="Change password"
               bodyContent={
-                <p>{"Body text"}</p>
+                <div>Send the password change instruction to the <a href="mailto:asc@story.book">asc@story.book</a> email address</div>
               }
               footerContent={[
                 <Button
-                  key="OkBtn"
-                  label="Ok"
+                  key="SendBtn"
+                  label="Send"
                   primary={true}
+                  size="medium"
                   onClick={(e) => {
                     action('onOk')(e);
                     toggle(false);
                   }}
-                />,
-                <Button
-                  key="CancelBtn"
-                  label="Cancel"
-                  onClick={(e) => {
-                    action('onCancel')(e);
-                    toggle(false);
-                  }}
-                  style={{marginLeft:"8px"}}
                 />
               ]}
               onClose={e => {

From da09240b8d7c3c420d4cd8819bef3c227c55f54c Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Thu, 5 Sep 2019 12:28:36 +0300
Subject: [PATCH 12/37] Web.Client: Login: fixed translation

---
 .../src/components/pages/Login/index.js           | 15 ++++++++-------
 .../pages/Login/locales/en/translation.json       |  2 +-
 web/ASC.Web.Client/src/helpers/customNames.js     |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 web/ASC.Web.Client/src/helpers/customNames.js

diff --git a/web/ASC.Web.Client/src/components/pages/Login/index.js b/web/ASC.Web.Client/src/components/pages/Login/index.js
index 46b3702f42..ba1a6dca9f 100644
--- a/web/ASC.Web.Client/src/components/pages/Login/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Login/index.js
@@ -8,6 +8,7 @@ import { login } from '../../../store/auth/actions';
 import styled from 'styled-components';
 import { useTranslation } from 'react-i18next';
 import i18n from './i18n';
+import { welcomePageTitle } from './../../../helpers/customNames';
 
 const FormContainer = styled(Container)`
     margin-top: 70px;
@@ -94,11 +95,11 @@ const Form = props => {
     useEffect(() => {
         window.addEventListener('keydown', onKeyPress);
         window.addEventListener('keyup', onKeyPress);
-      // Remove event listeners on cleanup
-      return () => {
-        window.removeEventListener('keydown', onKeyPress);
-        window.removeEventListener('keyup', onKeyPress);
-      };
+        // Remove event listeners on cleanup
+        return () => {
+            window.removeEventListener('keydown', onKeyPress);
+            window.removeEventListener('keyup', onKeyPress);
+        };
     }, [onKeyPress]);
 
     return (
@@ -107,7 +108,7 @@ const Form = props => {
                 <Col sm="12" md={mdOptions}>
                     <Card className="login-card">
                         <CardImg className="card-img" src="images/dark_general.png" alt="Logo" top />
-                        <CardTitle  className="card-title">{t('TitleCloudOfficeApplications')}</CardTitle>
+                        <CardTitle className="card-title">{t('CustomWelcomePageTitle', { welcomePageTitle })}</CardTitle>
                     </Card>
                 </Col>
             </Row>
@@ -168,7 +169,7 @@ const Form = props => {
                         onClick={onSubmit} />
                 </Col>
             </Row>
-            <Collapse isOpen={ !!errorText }>
+            <Collapse isOpen={!!errorText}>
                 <Row className="login-row">
                     <Col sm="12" md={mdOptions}>
                         <div className="alert alert-danger">{errorText}</div>
diff --git a/web/ASC.Web.Client/src/components/pages/Login/locales/en/translation.json b/web/ASC.Web.Client/src/components/pages/Login/locales/en/translation.json
index d36ae3b013..0758dd898f 100644
--- a/web/ASC.Web.Client/src/components/pages/Login/locales/en/translation.json
+++ b/web/ASC.Web.Client/src/components/pages/Login/locales/en/translation.json
@@ -4,5 +4,5 @@
   "Password": "Password",
   "RegistrationEmailWatermark": "Your registration email",
 
-  "TitleCloudOfficeApplications": "Cloud Office Applications"
+  "CustomWelcomePageTitle": "{{welcomePageTitle}}"
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Client/src/helpers/customNames.js b/web/ASC.Web.Client/src/helpers/customNames.js
new file mode 100644
index 0000000000..6f77323c50
--- /dev/null
+++ b/web/ASC.Web.Client/src/helpers/customNames.js
@@ -0,0 +1 @@
+export const welcomePageTitle = 'Cloud Office Applications';
\ No newline at end of file

From e2e5d32877fc08671b2fc2a08ef24cc82e0e4a3b Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Thu, 5 Sep 2019 12:32:18 +0300
Subject: [PATCH 13/37] Web.Client: Confirm: added translations, layout markup
 and validating for simple form

---
 .../src/components/pages/Confirm/i18n.js      |  57 +++++
 .../src/components/pages/Confirm/index.js     | 228 +++++++++++++++++-
 .../pages/Confirm/locales/en/translation.json |  12 +
 web/ASC.Web.Client/src/resourceConfig.json    |  11 +
 4 files changed, 303 insertions(+), 5 deletions(-)
 create mode 100644 web/ASC.Web.Client/src/components/pages/Confirm/i18n.js
 create mode 100644 web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json

diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/i18n.js b/web/ASC.Web.Client/src/components/pages/Confirm/i18n.js
new file mode 100644
index 0000000000..3ae4280b55
--- /dev/null
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/i18n.js
@@ -0,0 +1,57 @@
+import i18n from "i18next";
+import Backend from "i18next-xhr-backend";
+
+const newInstance = i18n.createInstance();
+
+if (process.env.NODE_ENV === "production") {
+  newInstance
+    .use(Backend)
+    .init({
+      lng: 'en',
+      fallbackLng: "en",
+      debug: true,
+
+      interpolation: {
+        escapeValue: false, // not needed for react as it escapes by default
+        format: function (value, format) {
+          if (format === 'lowercase') return value.toLowerCase();
+          return value;
+        }
+      },
+
+      react: {
+        useSuspense: true
+      },
+      backend: {
+        loadPath: `/locales/Confirm/{{lng}}/{{ns}}.json`
+      }
+    });
+} else if (process.env.NODE_ENV === "development") {
+
+  const resources = {
+    en: {
+      translation: require("./locales/en/translation.json")
+    }
+  };
+
+  newInstance.init({
+    resources: resources,
+    lng: 'en',
+    fallbackLng: "en",
+    debug: true,
+
+    interpolation: {
+      escapeValue: false, // not needed for react as it escapes by default
+      format: function (value, format) {
+        if (format === 'lowercase') return value.toLowerCase();
+        return value;
+      }
+    },
+
+    react: {
+      useSuspense: true
+    }
+  });
+}
+
+export default newInstance;
\ No newline at end of file
diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
index 57f4319ae0..4581ef70c0 100644
--- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
@@ -1,14 +1,232 @@
-import React from 'react';
+import React, { useState, useCallback, useEffect } from 'react';
 import { withRouter } from "react-router";
+import { useTranslation } from 'react-i18next';
+import i18n from './i18n';
+import { Button, TextInput, PageLayout, Text } from 'asc-web-components';
+import { Container, Row, Col } from 'reactstrap';
+import styled from 'styled-components';
+import { welcomePageTitle } from './../../../helpers/customNames';
+
+const ConfirmContainer = styled(Container)`
+    .confirm-block-title {
+        margin: 20px 0px;
+    }
+
+    .login-row {
+        margin: 23px 0 0;
+    }
+`;
+const mdOptions = { size: 6, offset: 3 };
 
 const Confirm = (props) => {
-    const { match } = props;
+    const { t } = useTranslation('translation', { i18n });
+    const [email, setEmail] = useState('');
+    const [emailValid, setEmailValid] = useState(true);
+    const [firstName, setFirstName] = useState('');
+    const [firstNameValid, setFirstNameValid] = useState(true);
+    const [lastName, setLastName] = useState('');
+    const [lastNameValid, setLastNameValid] = useState(true);
+    const [password, setPassword] = useState('');
+    const [passwordValid, setPasswordValid] = useState(true);
+    const [errorText, setErrorText] = useState("");
+    const [isLoading, setIsLoading] = useState(false);
 
-    const matchStr = JSON.stringify(match);
+    const queryString = window.location.search.slice(1);
+    const queryParams = queryString.split('&');
+    const arrayOfQueryParams = queryParams.map(queryParam => queryParam.split('='));
+    // const linkParams = Object.fromEntries(arrayOfQueryParams);
+    const emailRegex = '[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$';
+    const validationEmail = new RegExp(emailRegex);
+
+    const onSubmit = useCallback((e) => {
+        //e.preventDefault();
+
+        errorText && setErrorText("");
+
+        let hasError = false;
+
+        if (!validationEmail.test(email.trim())) {
+            hasError = true;
+            setEmailValid(!hasError);
+        }
+
+        if (!firstName.trim()) {
+            hasError = true;
+            setFirstNameValid(!hasError);
+        }
+
+        if (!lastName.trim()) {
+            hasError = true;
+            setLastNameValid(!hasError);
+        }
+
+        if (!password.trim()) {
+            hasError = true;
+            setPasswordValid(!hasError);
+        }
+
+        if (hasError)
+            return false;
+
+        setIsLoading(true);
+
+
+    }, [errorText, email, firstName, lastName, password, validationEmail]);
+
+    const onKeyPress = useCallback((target) => {
+        if (target.code === "Enter") {
+            onSubmit();
+        }
+    }, [onSubmit]);
+
+
+    useEffect(() => {
+        window.addEventListener('keydown', onKeyPress);
+        window.addEventListener('keyup', onKeyPress);
+        // Remove event listeners on cleanup
+        return () => {
+            window.removeEventListener('keydown', onKeyPress);
+            window.removeEventListener('keyup', onKeyPress);
+        };
+    }, [onKeyPress]);
 
     return (
-        <span>{matchStr}</span>
+        <ConfirmContainer>
+
+            <Row className='confirm-block-title'>
+                <Col sm="12" md={mdOptions}>
+                    <Text.Body as='p' fontSize={18}>{t('InviteTitle')}</Text.Body>
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <a href='/login'>
+                        <img className='login-row' src="images/dark_general.png" alt="Logo" />
+                    </a>
+                    <Text.Body as='p' fontSize={24} color='#116d9d'>{t('CustomWelcomePageTitle', { welcomePageTitle })}</Text.Body>
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <TextInput
+                        type="email"
+                        id='email'
+                        name='email'
+                        value={email}
+                        placeholder={t('Email')}
+                        size='huge'
+                        scale={true}
+                        isAutoFocussed={true}
+                        tabIndex={1}
+                        autoComplete='email'
+                        isDisabled={isLoading}
+                        hasError={!emailValid}
+                        onChange={event => {
+                            setEmail(event.target.value);
+                            !emailValid && setEmailValid(true);
+                            errorText && setErrorText("");
+                        }}
+                        onKeyDown={event => onKeyPress(event.target)}
+                    />
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <TextInput
+                        id='name'
+                        name='name'
+                        value={firstName}
+                        placeholder={t('FirstName')}
+                        size='huge'
+                        scale={true}
+                        tabIndex={2}
+                        autoComplete='given-name'
+                        isDisabled={isLoading}
+                        hasError={!firstNameValid}
+                        onChange={event => {
+                            setFirstName(event.target.value);
+                            !firstNameValid && setFirstNameValid(true);
+                            errorText && setErrorText("");
+                        }}
+                        onKeyDown={event => onKeyPress(event.target)}
+                    />
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <TextInput
+                        id='surname'
+                        name='surname'
+                        value={lastName}
+                        placeholder={t('LastName')}
+                        size='huge'
+                        scale={true}
+                        tabIndex={3}
+                        autoComplete='family-name'
+                        isDisabled={isLoading}
+                        hasError={!lastNameValid}
+                        onChange={event => {
+                            setLastName(event.target.value);
+                            !lastNameValid && setLastNameValid(true);
+                            errorText && setErrorText("");
+                        }}
+                        onKeyDown={event => onKeyPress(event.target)}
+                    />
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <TextInput
+                        id='password'
+                        name='password'
+                        type="password"
+                        value={password}
+                        placeholder={t('InvitePassword')}
+                        size='huge'
+                        scale={true}
+                        tabIndex={4}
+                        isDisabled={isLoading}
+                        hasError={!passwordValid}
+                        onChange={event => {
+                            setPassword(event.target.value);
+                            !passwordValid && setPasswordValid(true);
+                            errorText && setErrorText("");
+                            onKeyPress(event.target);
+                        }}
+                        onKeyDown={event => onKeyPress(event.target)}
+                    />
+                </Col>
+            </Row>
+
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <Button
+                        primary
+                        size='big'
+                        label={t('LoginRegistryButton')}
+                        tabIndex={5}
+                        isDisabled={isLoading}
+                        isLoading={isLoading}
+                        onClick={onSubmit}
+                    />
+                </Col>
+            </Row>
+
+            {/*             <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <Text.Body as='p' fontSize={14}>{t('LoginWithAccount')}</Text.Body>
+                </Col>
+            </Row>
+ */}
+        </ConfirmContainer>
     );
 }
 
-export default withRouter(Confirm);
\ No newline at end of file
+const ConfirmForm = (props) => (<PageLayout sectionBodyContent={<Confirm {...props} />} />);
+
+export default withRouter(ConfirmForm);
\ No newline at end of file
diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json b/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json
new file mode 100644
index 0000000000..0ae15d8ef0
--- /dev/null
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json
@@ -0,0 +1,12 @@
+{
+  "InviteTitle": "You are invited to join this portal!",
+  "LoginRegistryButton": "Join",
+  "LoginWithAccount": "or login with:",
+  "Email": "Email",
+  "InvitePassword": "Password",
+  "FirstName": "First Name",
+  "LastName": "Last Name",
+  
+
+  "CustomWelcomePageTitle": "{{welcomePageTitle}}"
+}
\ No newline at end of file
diff --git a/web/ASC.Web.Client/src/resourceConfig.json b/web/ASC.Web.Client/src/resourceConfig.json
index 8d208a2031..b523dddd3e 100644
--- a/web/ASC.Web.Client/src/resourceConfig.json
+++ b/web/ASC.Web.Client/src/resourceConfig.json
@@ -11,6 +11,17 @@
         "RegistrationEmailWatermark",
         "LoginButton"
       ]
+    },
+    "Confirm": {
+      "Resource": [
+        "InviteTitle",
+        "LoginRegistryButton",
+        "LoginWithAccount",
+        "Email",
+        "InvitePassword",
+        "FirstName",
+        "LastName"
+      ]
     }
   },
   "Layout": {

From 3c2d99a64e44fec018001e49f4120bd61cfe371c Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Thu, 5 Sep 2019 12:32:20 +0300
Subject: [PATCH 14/37] ASC.People: ProfileAction: Update: user type change
 fixed

---
 .../Section/Body/createUserForm.js            | 22 +++++++--------
 .../Section/Body/updateUserForm.js            | 27 ++++++++++++-------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
index 1b809663c4..eb90f6d43d 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
@@ -21,7 +21,7 @@ class CreateUserForm extends React.Component {
 
     this.validate = this.validate.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
-    this.onTextChange = this.onTextChange.bind(this);
+    this.onInputChange = this.onInputChange.bind(this);
     this.onBirthdayDateChange = this.onBirthdayDateChange.bind(this);
     this.onWorkFromDateChange = this.onWorkFromDateChange.bind(this);
     this.onGroupClose = this.onGroupClose.bind(this);
@@ -52,7 +52,7 @@ class CreateUserForm extends React.Component {
     };
   }
 
-  onTextChange(event) {
+  onInputChange(event) {
     var stateCopy = Object.assign({}, this.state);
     stateCopy.profile[event.target.name] = event.target.value;
     this.setState(stateCopy)
@@ -138,7 +138,7 @@ class CreateUserForm extends React.Component {
               inputName="firstName"
               inputValue={profile.firstName}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputAutoFocussed={true}
               inputTabIndex={1}
             />
@@ -149,7 +149,7 @@ class CreateUserForm extends React.Component {
               inputName="lastName"
               inputValue={profile.lastName}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={2}
             />
             <TextField
@@ -159,7 +159,7 @@ class CreateUserForm extends React.Component {
               inputName="email"
               inputValue={profile.email}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={3}
             />
             <PasswordField
@@ -173,11 +173,11 @@ class CreateUserForm extends React.Component {
                 { value: 'temp', label: t("TemporaryPassword")}
               ]}
               radioIsDisabled={isLoading}
-              radioOnChange={this.onTextChange}
+              radioOnChange={this.onInputChange}
               inputName="password"
               inputValue={profile.password}
               inputIsDisabled={isLoading || profile.passwordType === "link"}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputIconOnClick={this.onShowPassword}
               inputShowPassword={showPassword}
               refreshIconOnClick={()=>{}}
@@ -202,7 +202,7 @@ class CreateUserForm extends React.Component {
                 { value: 'female', label: t("SexFemale")}
               ]}
               radioIsDisabled={isLoading}
-              radioOnChange={this.onTextChange}
+              radioOnChange={this.onInputChange}
             />
             <DateField
               labelText={`${t("CustomEmployedSinceDate", { employedSinceDate })}:`}
@@ -217,7 +217,7 @@ class CreateUserForm extends React.Component {
               inputName="location"
               inputValue={profile.location}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={7}
             />
             <TextField
@@ -225,7 +225,7 @@ class CreateUserForm extends React.Component {
               inputName="title"
               inputValue={profile.title}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={8}
             />
             <DepartmentField
@@ -237,7 +237,7 @@ class CreateUserForm extends React.Component {
         </MainContainer>
         <div>
           <Text.ContentHeader>{t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onTextChange} tabIndex={9}/> 
+          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onInputChange} tabIndex={9}/> 
         </div>
         <div style={{marginTop: "60px"}}>
           <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={10}/>
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index 39fbe691fe..34eec5fe86 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -21,7 +21,8 @@ class UpdateUserForm extends React.Component {
 
     this.validate = this.validate.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
-    this.onTextChange = this.onTextChange.bind(this);
+    this.onInputChange = this.onInputChange.bind(this);
+    this.onUserTypeChange = this.onUserTypeChange.bind(this);
     this.onBirthdayDateChange = this.onBirthdayDateChange.bind(this);
     this.onWorkFromDateChange = this.onWorkFromDateChange.bind(this);
     this.onGroupClose = this.onGroupClose.bind(this);
@@ -49,12 +50,18 @@ class UpdateUserForm extends React.Component {
     };
   }
 
-  onTextChange(event) {
+  onInputChange(event) {
     var stateCopy = Object.assign({}, this.state);
     stateCopy.profile[event.target.name] = event.target.value;
     this.setState(stateCopy)
   }
 
+  onUserTypeChange(event) {
+    var stateCopy = Object.assign({}, this.state);
+    stateCopy.profile.isVisitor = event.target.value === "true";
+    this.setState(stateCopy)
+  }
+
   onBirthdayDateChange(value) {
     var stateCopy = Object.assign({}, this.state);
     stateCopy.profile.birthday = value ? value.toJSON() : null;
@@ -165,7 +172,7 @@ class UpdateUserForm extends React.Component {
               inputName="firstName"
               inputValue={profile.firstName}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputAutoFocussed={true}
               inputTabIndex={4}
             />
@@ -176,7 +183,7 @@ class UpdateUserForm extends React.Component {
               inputName="lastName"
               inputValue={profile.lastName}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={5}
             />
             <DateField
@@ -196,18 +203,18 @@ class UpdateUserForm extends React.Component {
                 { value: 'female', label: t("SexFemale")}
               ]}
               radioIsDisabled={isLoading}
-              radioOnChange={this.onTextChange}
+              radioOnChange={this.onInputChange}
             />
             <RadioField
               labelText={`${t("UserType")}:`}
-              radioName="sex"
+              radioName="isVisitor"
               radioValue={profile.isVisitor.toString()}
               radioOptions={[
                 { value: "true", label: t("CustomTypeGuest", { typeGuest })},
                 { value: "false", label: t("CustomTypeUser", { typeUser })}
               ]}
               radioIsDisabled={isLoading}
-              radioOnChange={this.onTextChange}
+              radioOnChange={this.onUserTypeChange}
             />
             <DateField
               labelText={`${t("CustomEmployedSinceDate", { employedSinceDate })}:`}
@@ -222,7 +229,7 @@ class UpdateUserForm extends React.Component {
               inputName="location"
               inputValue={profile.location}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={8}
             />
             <TextField
@@ -230,7 +237,7 @@ class UpdateUserForm extends React.Component {
               inputName="title"
               inputValue={profile.title}
               inputIsDisabled={isLoading}
-              inputOnChange={this.onTextChange}
+              inputOnChange={this.onInputChange}
               inputTabIndex={9}
             />
             <DepartmentField
@@ -242,7 +249,7 @@ class UpdateUserForm extends React.Component {
         </MainContainer>
         <div>
           <Text.ContentHeader>{t("Comments")}</Text.ContentHeader>
-          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onTextChange} tabIndex={10}/> 
+          <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onInputChange} tabIndex={10}/> 
         </div>
         <div style={{marginTop: "60px"}}>
           <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={11}/>

From 4753c3c3dec0c92e3b2f1cabcf74ef407e795079 Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Thu, 5 Sep 2019 12:41:59 +0300
Subject: [PATCH 15/37] ASC.People: fix styles in ModalDialog component

---
 .../src/components/pages/Home/Section/Body/index.js      | 9 +++++++++
 .../pages/ProfileAction/Section/Body/updateUserForm.js   | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
index c6441c5995..99d2a53583 100644
--- a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
+++ b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
@@ -86,6 +86,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="OkBtn"
             label="Send"
+            size="medium"
             primary={true}
             onClick={() => {
               const { onLoading } = this.props;
@@ -107,6 +108,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="CancelBtn"
             label="Cancel"
+            size="medium"
             primary={false}
             onClick={this.onDialogClose}
             style={{ marginLeft: "8px" }}
@@ -142,6 +144,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="OkBtn"
             label="Send"
+            size="medium"
             primary={true}
             onClick={() => {
               toastr.success(
@@ -153,6 +156,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="CancelBtn"
             label="Cancel"
+            size="medium"
             primary={false}
             onClick={this.onDialogClose}
             style={{ marginLeft: "8px" }}
@@ -215,6 +219,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="OkBtn"
             label="OK"
+            size="medium"
             primary={true}
             onClick={() => {
               const { onLoading, filter, fetchPeople } = this.props;
@@ -232,6 +237,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="ReassignBtn"
             label="Reassign data"
+            size="medium"
             primary={true}
             onClick={() => {
               toastr.success("Context action: Reassign profile");
@@ -242,6 +248,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="CancelBtn"
             label="Cancel"
+            size="medium"
             primary={false}
             onClick={this.onDialogClose}
             style={{ marginLeft: "8px" }}
@@ -268,6 +275,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="OkBtn"
             label="Send"
+            size="medium"
             primary={true}
             onClick={() => {
               const { onLoading } = this.props;
@@ -289,6 +297,7 @@ class SectionBodyContent extends React.PureComponent {
           <Button
             key="CancelBtn"
             label="Cancel"
+            size="medium"
             primary={false}
             onClick={this.onDialogClose}
             style={{ marginLeft: "8px" }}
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index 34eec5fe86..b6682bf16f 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -258,9 +258,9 @@ class UpdateUserForm extends React.Component {
 
         <ModalDialog
           visible={isDialogVisible}
-          headerContent={"Change something"}
-          bodyContent={<p>Send the something instructions?</p>}
-          footerContent={<Button label="Send" primary={true} onClick={this.onDialogClose} />}
+          headerContent={"Change password"}
+          bodyContent={<Text.Body>Send the password change instruction to the <a href="mailto:asc@story.book">asc@story.book</a> email address</Text.Body>}
+          footerContent={<Button key="SendBtn" label="Send" size="medium" primary={true} onClick={this.onDialogClose} />}
           onClose={this.onDialogClose}
         />
       </>

From bd47ce3bfd0db17728d6a06a00ff84de811dd210 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:00:26 +0300
Subject: [PATCH 16/37] web: People: Added loading password settings from api

---
 .../Client/src/store/services/api.js           | 18 ++++++++++++++----
 .../Client/src/store/services/fakeApi.js       | 11 +++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/products/ASC.People/Client/src/store/services/api.js b/products/ASC.People/Client/src/store/services/api.js
index 080b4a6a66..f5c7f45fc1 100644
--- a/products/ASC.People/Client/src/store/services/api.js
+++ b/products/ASC.People/Client/src/store/services/api.js
@@ -35,6 +35,12 @@ export function getSettings() {
     : axios.get(`${API_URL}/settings.json`);
 }
 
+export function getPortalPasswordSettings() {
+  return IS_FAKE
+    ? fakeApi.getPortalPasswordSettings()
+    : axios.get(`${API_URL}/settings/security/password`);
+}
+
 export function getUser(userId) {
   return IS_FAKE
     ? fakeApi.getUser()
@@ -64,13 +70,17 @@ export function updateUser(data) {
 }
 
 export function getInitInfo() {
-  return axios.all([getUser(), getModulesList(), getSettings()]).then(
-    axios.spread(function(userResp, modulesResp, settingsResp) {
-      return Promise.resolve({
+  return axios.all([getUser(), getModulesList(), getSettings(), getPortalPasswordSettings()]).then(
+    axios.spread(function(userResp, modulesResp, settingsResp, passwordSettingsResp) {
+      let info = {
         user: userResp.data.response,
         modules: modulesResp.data.response,
         settings: settingsResp.data.response
-      });
+      };
+
+      info.settings.passwordSettings = passwordSettingsResp.data.response;
+
+      return Promise.resolve(info);
     })
   );
 }
diff --git a/products/ASC.People/Client/src/store/services/fakeApi.js b/products/ASC.People/Client/src/store/services/fakeApi.js
index e0c08b7ff5..1941330483 100644
--- a/products/ASC.People/Client/src/store/services/fakeApi.js
+++ b/products/ASC.People/Client/src/store/services/fakeApi.js
@@ -53,6 +53,17 @@ export function getSettings() {
   return fakeResponse(data);
 }
 
+export function getPortalPasswordSettings() {
+  const data = {
+    minLength: 6,
+    upperCase: false,
+    digits: false,
+    specSymbols: false
+  };
+
+  return fakeResponse(data);
+}
+
 export function getUser() {
   const data = {
     index: "a",

From 7d0a528feea1f1c48812aee9f68612d2208f9344 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:11:37 +0300
Subject: [PATCH 17/37] web: People: ProfileAction: PasswordInput component
 applied

---
 .../Section/Body/FormFields/PasswordField.js  | 89 ++++++-------------
 .../Section/Body/createUserForm.js            | 40 ++++-----
 2 files changed, 41 insertions(+), 88 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
index 08c8b59a25..64844c647b 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/PasswordField.js
@@ -1,38 +1,12 @@
 import React from 'react'
-import styled from 'styled-components';
-import { utils, FieldContainer, RadioButtonGroup, InputBlock, Icons, Link } from 'asc-web-components'
-
-const PasswordBlock = styled.div`
-  display: flex;
-  align-items: center;
-  line-height: 32px;
-  flex-direction: row;
-
-  .refresh-btn, .copy-link {
-    margin: 0 0 0 16px;
-  }
-
-  @media ${utils.device.tablet} {
-    flex-direction: column;
-    align-items: start;
-
-    .copy-link {
-      margin: 0;
-    }
-  }
-`;
-
-const InputContainer = styled.div`
-  width: 352px;
-  display: flex;
-  align-items: center;
-`;
+import { FieldContainer, RadioButtonGroup, PasswordInput } from 'asc-web-components'
 
 const PasswordField = React.memo((props) => {
   const {
     isRequired,
     hasError,
     labelText,
+    passwordSettings,
 
     radioName,
     radioValue,
@@ -41,20 +15,17 @@ const PasswordField = React.memo((props) => {
     radioOnChange,
 
     inputName,
+    emailInputName,
     inputValue,
     inputIsDisabled,
     inputOnChange,
     inputTabIndex,
 
-    inputIconOnClick,
-    inputShowPassword,
-
-    refreshIconOnClick,
-
     copyLinkText,
-    copyLinkOnClick
   } = props;
-  
+
+  const tooltipPasswordLength = 'from ' + passwordSettings.minLength + ' to 30 characters';
+
   return (
     <FieldContainer
       isRequired={isRequired}
@@ -69,35 +40,25 @@ const PasswordField = React.memo((props) => {
         onClick={radioOnChange}
         className="radio-group"
       />
-      <PasswordBlock>
-        <InputContainer>
-          <InputBlock 
-            name={inputName}
-            hasError={hasError}
-            isDisabled={inputIsDisabled}
-            iconName="EyeIcon"
-            value={inputValue}
-            onIconClick={inputIconOnClick}
-            onChange={inputOnChange}
-            scale={true}
-            type={inputShowPassword ? "text" : "password"}
-            tabIndex={inputTabIndex}
-          />
-          <Icons.RefreshIcon
-            size="medium"
-            onClick={refreshIconOnClick}
-            className="refresh-btn"
-          />
-        </InputContainer>
-        <Link
-          type="action"
-          isHovered={true}
-          onClick={copyLinkOnClick}
-          className="copy-link"
-        >
-          {copyLinkText}
-        </Link>
-      </PasswordBlock>
+      <PasswordInput
+        inputName={inputName}
+        emailInputName={emailInputName}
+        inputValue={inputValue}
+        inputWidth="320px"
+        inputTabIndex={inputTabIndex}
+        onChange={inputOnChange}
+        clipActionResource={copyLinkText}
+        clipEmailResource='E-mail: '
+        clipPasswordResource='Password: '
+        tooltipPasswordTitle='Password must contain:'
+        tooltipPasswordLength={tooltipPasswordLength}
+        tooltipPasswordDigits='digits'
+        tooltipPasswordCapital='capital letters'
+        tooltipPasswordSpecial='special characters (!@#$%^&*)'
+        generatorSpecial='!@#$%^&*'
+        passwordSettings={passwordSettings}
+        isDisabled={inputIsDisabled}
+      />
     </FieldContainer>
   );
 });
diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
index eb90f6d43d..d5acf54314 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
@@ -25,7 +25,6 @@ class CreateUserForm extends React.Component {
     this.onBirthdayDateChange = this.onBirthdayDateChange.bind(this);
     this.onWorkFromDateChange = this.onWorkFromDateChange.bind(this);
     this.onGroupClose = this.onGroupClose.bind(this);
-    this.onShowPassword = this.onShowPassword.bind(this);
     this.onCancel = this.onCancel.bind(this);
   }
 
@@ -38,14 +37,13 @@ class CreateUserForm extends React.Component {
   mapPropsToState = (props) => {
     return {
       isLoading: false,
-      showPassword: false,
       errors: {
         firstName: false,
         lastName: false,
         email: false,
         password: false,
       },
-      profile: toEmployeeWrapper({ 
+      profile: toEmployeeWrapper({
         isVisitor: props.match.params.type === "guest",
         passwordType: "link"
       })
@@ -76,10 +74,6 @@ class CreateUserForm extends React.Component {
     this.setState(stateCopy)
   }
 
-  onShowPassword() {
-    this.setState({showPassword: !this.state.showPassword});
-  }
-
   validate() {
     const { profile } = this.state;
     const emailRegex = /.+@.+\..+/;
@@ -90,15 +84,15 @@ class CreateUserForm extends React.Component {
       password: profile.passwordType === "temp" && !profile.password
     };
     const hasError = errors.firstName || errors.lastName || errors.email || errors.password;
-    this.setState({errors: errors});
+    this.setState({ errors: errors });
     return !hasError;
   }
 
   handleSubmit() {
-    if(!this.validate())
+    if (!this.validate())
       return false;
 
-    this.setState({isLoading: true});
+    this.setState({ isLoading: true });
 
     this.props.createProfile(this.state.profile)
       .then((profile) => {
@@ -107,7 +101,7 @@ class CreateUserForm extends React.Component {
       })
       .catch((error) => {
         toastr.error(error.message)
-        this.setState({isLoading: false})
+        this.setState({ isLoading: false })
       });
   }
 
@@ -116,8 +110,8 @@ class CreateUserForm extends React.Component {
   }
 
   render() {
-    const { isLoading, showPassword, errors, profile } = this.state;
-    const { t } = this.props;
+    const { isLoading, errors, profile } = this.state;
+    const { t, settings } = this.props;
 
     return (
       <>
@@ -169,21 +163,19 @@ class CreateUserForm extends React.Component {
               radioName="passwordType"
               radioValue={profile.passwordType}
               radioOptions={[
-                { value: 'link', label: t("ActivationLink")},
-                { value: 'temp', label: t("TemporaryPassword")}
+                { value: 'link', label: t("ActivationLink") },
+                { value: 'temp', label: t("TemporaryPassword") }
               ]}
               radioIsDisabled={isLoading}
               radioOnChange={this.onInputChange}
               inputName="password"
+              emailInputName="email"
               inputValue={profile.password}
               inputIsDisabled={isLoading || profile.passwordType === "link"}
               inputOnChange={this.onInputChange}
-              inputIconOnClick={this.onShowPassword}
-              inputShowPassword={showPassword}
-              refreshIconOnClick={()=>{}}
               copyLinkText={t("CopyEmailAndPassword")}
-              copyLinkOnClick={()=>{}}
               inputTabIndex={4}
+              passwordSettings={settings.passwordSettings}
             />
             <DateField
               labelText={`${t("Birthdate")}:`}
@@ -198,8 +190,8 @@ class CreateUserForm extends React.Component {
               radioName="sex"
               radioValue={profile.sex}
               radioOptions={[
-                { value: 'male', label: t("SexMale")},
-                { value: 'female', label: t("SexFemale")}
+                { value: 'male', label: t("SexMale") },
+                { value: 'female', label: t("SexFemale") }
               ]}
               radioIsDisabled={isLoading}
               radioOnChange={this.onInputChange}
@@ -239,9 +231,9 @@ class CreateUserForm extends React.Component {
           <Text.ContentHeader>{t("Comments")}</Text.ContentHeader>
           <Textarea name="notes" value={profile.notes} isDisabled={isLoading} onChange={this.onInputChange} tabIndex={9}/> 
         </div>
-        <div style={{marginTop: "60px"}}>
-          <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={10}/>
-          <Button label={t("CancelButton")} onClick={this.onCancel} isDisabled={isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={11}/>
+        <div style={{ marginTop: "60px" }}>
+          <Button label={t("SaveButton")} onClick={this.handleSubmit} primary isDisabled={isLoading} size="big" tabIndex={10} />
+          <Button label={t("CancelButton")} onClick={this.onCancel} isDisabled={isLoading} size="big" style={{ marginLeft: "8px" }} tabIndex={11} />
         </div>
       </>
     );

From b63b63a48b0b077c452d81c50fc19f7f326e567c Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Thu, 5 Sep 2019 15:30:26 +0300
Subject: [PATCH 18/37] Web.Client: Confirm: PasswordInput component applied

---
 .../src/components/pages/Confirm/index.js     | 40 +++++++++++++++++--
 .../pages/Confirm/locales/en/translation.json |  6 +++
 web/ASC.Web.Client/src/resourceConfig.json    |  6 +++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
index 4581ef70c0..1c9026d0e6 100644
--- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
@@ -2,7 +2,7 @@ import React, { useState, useCallback, useEffect } from 'react';
 import { withRouter } from "react-router";
 import { useTranslation } from 'react-i18next';
 import i18n from './i18n';
-import { Button, TextInput, PageLayout, Text } from 'asc-web-components';
+import { Button, TextInput, PageLayout, Text, PasswordInput } from 'asc-web-components';
 import { Container, Row, Col } from 'reactstrap';
 import styled from 'styled-components';
 import { welcomePageTitle } from './../../../helpers/customNames';
@@ -18,6 +18,13 @@ const ConfirmContainer = styled(Container)`
 `;
 const mdOptions = { size: 6, offset: 3 };
 
+const passwordSettings = {
+    minLength: 6,
+    upperCase: true,
+    digits: true,
+    specSymbols: true
+};
+
 const Confirm = (props) => {
     const { t } = useTranslation('translation', { i18n });
     const [email, setEmail] = useState('');
@@ -181,7 +188,34 @@ const Confirm = (props) => {
 
             <Row className='login-row'>
                 <Col sm="12" md={mdOptions}>
-                    <TextInput
+                    <PasswordInput
+                        inputName="password"
+                        emailInputName="email"
+                        inputValue={password}
+                        placeholder={t('InvitePassword')}
+                        size='huge'
+                        scale={true}
+                        tabIndex={4}
+                        hasError={!passwordValid}
+                        onChange={event => {
+                            setPassword(event.target.value);
+                            !passwordValid && setPasswordValid(true);
+                            errorText && setErrorText("");
+                            onKeyPress(event.target);
+                        }}
+                        clipActionResource={t('CopyEmailAndPassword')}
+                        clipEmailResource={`${t('Email')}: `}
+                        clipPasswordResource={`${t('InvitePassword')}: `}
+                        tooltipPasswordTitle={`${t('ErrorPasswordMessage')}:`}
+                        tooltipPasswordLength={`${t('ErrorPasswordLength', { fromNumber: 6, toNumber:30 })}:`}
+                        tooltipPasswordDigits={t('ErrorPasswordNoDigits')}
+                        tooltipPasswordCapital={t('ErrorPasswordNoUpperCase')}
+                        tooltipPasswordSpecial={`${t('ErrorPasswordNoSpecialSymbols')} (!@#$%^&*)`}
+                        generatorSpecial="!@#$%^&*"
+                        passwordSettings={passwordSettings}
+                        isDisabled={isLoading}
+                    />
+                    {/* <TextInput
                         id='password'
                         name='password'
                         type="password"
@@ -199,7 +233,7 @@ const Confirm = (props) => {
                             onKeyPress(event.target);
                         }}
                         onKeyDown={event => onKeyPress(event.target)}
-                    />
+                    /> */}
                 </Col>
             </Row>
 
diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json b/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json
index 0ae15d8ef0..8cc012c602 100644
--- a/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/locales/en/translation.json
@@ -6,6 +6,12 @@
   "InvitePassword": "Password",
   "FirstName": "First Name",
   "LastName": "Last Name",
+  "CopyEmailAndPassword": "Copy email and password",
+  "ErrorPasswordMessage": "Password must contain",
+  "ErrorPasswordLength": "from {{fromNumber}} to {{toNumber}} characters",
+  "ErrorPasswordNoDigits": "digits",
+  "ErrorPasswordNoUpperCase": "capital letters",
+  "ErrorPasswordNoSpecialSymbols": "special characters",
   
 
   "CustomWelcomePageTitle": "{{welcomePageTitle}}"
diff --git a/web/ASC.Web.Client/src/resourceConfig.json b/web/ASC.Web.Client/src/resourceConfig.json
index b523dddd3e..73ca278a2f 100644
--- a/web/ASC.Web.Client/src/resourceConfig.json
+++ b/web/ASC.Web.Client/src/resourceConfig.json
@@ -20,6 +20,12 @@
         "Email",
         "InvitePassword",
         "FirstName",
+        "CopyEmailAndPassword",
+        "ErrorPasswordMessage",
+        "ErrorPasswordLength",
+        "ErrorPasswordNoDigits",
+        "ErrorPasswordNoUpperCase",
+        "ErrorPasswordNoSpecialSymbols",
         "LastName"
       ]
     }

From 470bbdee9dc895464e15a211099281ee155b31b7 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:30:25 +0300
Subject: [PATCH 19/37] web: Components: Added new property at PasswordInput
 component. Fixed story.

---
 .../src/components/password-input/index.js         | 14 ++++++++++++--
 .../stories/input/password/README.md               |  7 ++++---
 .../stories/input/password/index.stories.js        |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/web/ASC.Web.Components/src/components/password-input/index.js b/web/ASC.Web.Components/src/components/password-input/index.js
index 08d2376535..f0bde1f1c2 100644
--- a/web/ASC.Web.Components/src/components/password-input/index.js
+++ b/web/ASC.Web.Components/src/components/password-input/index.js
@@ -239,7 +239,12 @@ class PasswordInput extends React.PureComponent {
       tooltipPasswordSpecial,
       emailInputName,
       inputWidth,
-      passwordSettings
+      passwordSettings,
+      hasError,
+      hasWarning,
+      placeholder,
+      tabIndex,
+      maxLength
     } = this.props;
     const {
       type,
@@ -297,6 +302,12 @@ class PasswordInput extends React.PureComponent {
             isIconFill={true}
             onFocus={this.onFocus}
             onBlur={this.onBlur}
+            hasError={hasError}
+            hasWarning={hasWarning}
+            placeholder={placeholder}
+            tabIndex={tabIndex}
+            maxLength={maxLength}
+            autoComplete='new-password'
           >
             {displayTooltip &&
               <DropDown directionY='top' manualY='150%' isOpen={true}>
@@ -353,7 +364,6 @@ PasswordInput.propTypes = {
 
   generatorSpecial: PropTypes.string,
   passwordSettings: PropTypes.object.isRequired
-
 }
 
 PasswordInput.defaultProps = {
diff --git a/web/ASC.Web.Storybook/stories/input/password/README.md b/web/ASC.Web.Storybook/stories/input/password/README.md
index 03fc778329..e615df9c25 100644
--- a/web/ASC.Web.Storybook/stories/input/password/README.md
+++ b/web/ASC.Web.Storybook/stories/input/password/README.md
@@ -19,7 +19,9 @@ Check for compliance with settings is carried out on fly. As you type in require
 
 Depending on screen width of device, input will change location of elements.
 
-When setting focus to input, tooltip will be shown with progress in fulfilling conditions specified in settings. When unfocused, tooltip disappears.
+When setting focus to input, tooltip will be shown with progress in fulfilling conditions specified in settings. When unfocused, tooltip disappears.  
+
+You can apply all the parameters of the InputBlock component to the component.
 
 #### Usage
 
@@ -74,5 +76,4 @@ const settings = {
 | `generatorSpecial`  | `string`  |    -     | -                  | `!@#$%^&*`| Set of special characters for password generator and validator|
 | `passwordSettings`  | `object`  |    ✅    | -                  | -         | Set of settings for password generator and validator      |
 | `isDisabled`        | `bool`    |    -     | -                  | `false`   | Set input disabled                                        |
-| `inputWidth`        | `string`  |    -     | -                  | -         | If you need to set input width manually                   |
-
+| `inputWidth`        | `string`  |    -     | -                  | -         | If you need to set input width manually                   |
\ No newline at end of file
diff --git a/web/ASC.Web.Storybook/stories/input/password/index.stories.js b/web/ASC.Web.Storybook/stories/input/password/index.stories.js
index d84e70cbc8..132f91fc1d 100644
--- a/web/ASC.Web.Storybook/stories/input/password/index.stories.js
+++ b/web/ASC.Web.Storybook/stories/input/password/index.stories.js
@@ -58,6 +58,8 @@ storiesOf('Components|Input', module)
               generatorSpecial='!@#$%^&*'
               passwordSettings={fakeSettings}
               isDisabled={isDisabled}
+              placeholder='password'
+              maxLength={30}
             />
           )}
         </StringValue>

From 2555c631d6fefee7404804a31a5b5e5dd7519381 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:30:44 +0300
Subject: [PATCH 20/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index b68906c145..b2d820dcdc 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From f315bc411abfba86fdabaa7349985e2288d64292 Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Thu, 5 Sep 2019 15:31:53 +0300
Subject: [PATCH 21/37] Web.Client: Confirm: in addition to
 (b63b63a48b0b077c452d81c50fc19f7f326e567c)

---
 .../src/components/pages/Confirm/index.js     | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
index 1c9026d0e6..c2e052d316 100644
--- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
@@ -215,25 +215,6 @@ const Confirm = (props) => {
                         passwordSettings={passwordSettings}
                         isDisabled={isLoading}
                     />
-                    {/* <TextInput
-                        id='password'
-                        name='password'
-                        type="password"
-                        value={password}
-                        placeholder={t('InvitePassword')}
-                        size='huge'
-                        scale={true}
-                        tabIndex={4}
-                        isDisabled={isLoading}
-                        hasError={!passwordValid}
-                        onChange={event => {
-                            setPassword(event.target.value);
-                            !passwordValid && setPasswordValid(true);
-                            errorText && setErrorText("");
-                            onKeyPress(event.target);
-                        }}
-                        onKeyDown={event => onKeyPress(event.target)}
-                    /> */}
                 </Col>
             </Row>
 

From f35ddc26b97c47027c78d6dae51d6be1178e895d Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:57:28 +0300
Subject: [PATCH 22/37] web: Components: Fixed default zIndex property for
 Backdrop component

---
 web/ASC.Web.Components/src/components/backdrop/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Components/src/components/backdrop/index.js b/web/ASC.Web.Components/src/components/backdrop/index.js
index 5d616cb232..626185ca9f 100644
--- a/web/ASC.Web.Components/src/components/backdrop/index.js
+++ b/web/ASC.Web.Components/src/components/backdrop/index.js
@@ -27,7 +27,7 @@ Backdrop.propTypes = {
 
 Backdrop.defaultProps = {
   visible: false,
-  zIndex: 100
+  zIndex: 500
 };
 
 export default Backdrop;
\ No newline at end of file

From aed69856038e9bfe0106be6b80195fccc5b8113d Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 15:57:39 +0300
Subject: [PATCH 23/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index b2d820dcdc..76ffe06469 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From e41899695caba27a2f7069d75b5b965925203aee Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:07:18 +0300
Subject: [PATCH 24/37] web: Components: Fixed large indent in absence of
 options

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

diff --git a/web/ASC.Web.Components/src/components/combobox/index.js b/web/ASC.Web.Components/src/components/combobox/index.js
index 28ba44969d..cf83f4278a 100644
--- a/web/ASC.Web.Components/src/components/combobox/index.js
+++ b/web/ASC.Web.Components/src/components/combobox/index.js
@@ -95,8 +95,8 @@ const StyledLabel = styled.div`
 const StyledArrowIcon = styled.div`
   display: flex;
   align-self: start;
-  width: 8px;
-  flex: 0 0 8px;
+  width: ${props => props.needDisplay ? '8px' : '0px'};
+  flex: 0 0 ${props => props.needDisplay ? '8px' : '0px'};
   margin-top: ${props => props.noBorder ? `5px` : `12px`};
   margin-right: ${props => props.needDisplay ? '8px' : '0px'};
   margin-left: ${props => props.needDisplay ? 'auto' : '0px'};

From 783fa7ef32697efbc62097939081d2d4dced4632 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:11:37 +0300
Subject: [PATCH 25/37] web: Components: Added key for advancedOptions at
 ComboBox story

---
 .../stories/input/combobox/combobox.stories.js         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/ASC.Web.Storybook/stories/input/combobox/combobox.stories.js b/web/ASC.Web.Storybook/stories/input/combobox/combobox.stories.js
index 79cc8e0cfa..2926ccd691 100644
--- a/web/ASC.Web.Storybook/stories/input/combobox/combobox.stories.js
+++ b/web/ASC.Web.Storybook/stories/input/combobox/combobox.stories.js
@@ -82,17 +82,17 @@ storiesOf('Components|Input', module)
 
     const advancedOptions =
       <>
-        <DropDownItem>
+        <DropDownItem key='1'>
           <RadioButton value='asc' name='first' label='A-Z' isChecked={true} />
         </DropDownItem>
-        <DropDownItem >
+        <DropDownItem key='2'>
           <RadioButton value='desc' name='first' label='Z-A' />
         </DropDownItem>
-        <DropDownItem isSeparator />
-        <DropDownItem>
+        <DropDownItem key='3' isSeparator />
+        <DropDownItem key='4'>
           <RadioButton value='first' name='second' label='First name' />
         </DropDownItem>
-        <DropDownItem>
+        <DropDownItem key='5'>
           <RadioButton value='last' name='second' label='Last name' isChecked={true} />
         </DropDownItem>
       </>;

From c84798bc8059ff140df492a9b4bb3c59681f2e92 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:19:24 +0300
Subject: [PATCH 26/37] web: Components: Added missing property`s for
 GroupButtonsMenu component

---
 .../src/components/group-buttons-menu/index.js                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/ASC.Web.Components/src/components/group-buttons-menu/index.js b/web/ASC.Web.Components/src/components/group-buttons-menu/index.js
index f345d0fc03..29c044078f 100644
--- a/web/ASC.Web.Components/src/components/group-buttons-menu/index.js
+++ b/web/ASC.Web.Components/src/components/group-buttons-menu/index.js
@@ -150,6 +150,7 @@ class GroupButtonsMenu extends React.PureComponent {
               fontWeight={item.fontWeight}
               disabled={item.disabled}
               onClick={this.groupButtonClick.bind(this, item)}
+              {...this.props}
             >
               {item.children}
             </GroupButton>

From c699cca823c7c767671d4ff5cf2fce92804ad091 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:19:40 +0300
Subject: [PATCH 27/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 76ffe06469..487ebb657e 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From a53ed4912d13fe907f0f8c53e62aaf2eaec5c7f2 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:46:46 +0300
Subject: [PATCH 28/37] web: Components: Fixed Backdrop zIndex for PageLayout
 component

---
 web/ASC.Web.Components/src/components/page-layout/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Components/src/components/page-layout/index.js b/web/ASC.Web.Components/src/components/page-layout/index.js
index 44ae96afb2..60d812b2fa 100644
--- a/web/ASC.Web.Components/src/components/page-layout/index.js
+++ b/web/ASC.Web.Components/src/components/page-layout/index.js
@@ -113,7 +113,7 @@ class PageLayout extends React.PureComponent {
       <>
         {
           this.state.isBackdropAvailable &&
-          <Backdrop visible={this.state.isBackdropVisible} onClick={this.backdropClick}/>
+          <Backdrop zIndex={400} visible={this.state.isBackdropVisible} onClick={this.backdropClick}/>
         }
         {
           this.state.isArticleAvailable &&

From 36cea752171f6f0fe563219b680f1a04bf3eadd8 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:49:07 +0300
Subject: [PATCH 29/37] web: Components: Fixed DropDown display abroad for
 PageLayout component

---
 .../src/components/page-layout/sub-comoponents/section.js        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/ASC.Web.Components/src/components/page-layout/sub-comoponents/section.js b/web/ASC.Web.Components/src/components/page-layout/sub-comoponents/section.js
index dc6ed146d4..8eec535162 100644
--- a/web/ASC.Web.Components/src/components/page-layout/sub-comoponents/section.js
+++ b/web/ASC.Web.Components/src/components/page-layout/sub-comoponents/section.js
@@ -6,7 +6,6 @@ const StyledSection = styled.section`
   flex-grow: 1;
   display: flex;
   flex-direction: column;
-  overflow: hidden auto;
 `;
 
 class Section extends React.Component {

From e4e22e070bb27f15355ab039856d2ceeec036d32 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Thu, 5 Sep 2019 16:49:21 +0300
Subject: [PATCH 30/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 487ebb657e..22665979b6 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From 427ded5ca7ee817c3b89db6f45f13dd1108e6b00 Mon Sep 17 00:00:00 2001
From: Andrey Savihin <andrey.savihin@onlyoffice.com>
Date: Thu, 5 Sep 2019 17:47:17 +0300
Subject: [PATCH 31/37] ASC.People: ProfileAction: Update: changed modal
 dialogs interface

---
 .../Section/Body/updateUserForm.js            | 129 +++++++++++++++---
 1 file changed, 113 insertions(+), 16 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
index b6682bf16f..79ffe3486b 100644
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { withRouter } from 'react-router'
 import { connect } from 'react-redux'
-import { Avatar, Button, Textarea, Text, toastr, ModalDialog } from 'asc-web-components'
+import { Avatar, Button, Textarea, Text, toastr, ModalDialog, TextInput } from 'asc-web-components'
 import { withTranslation } from 'react-i18next';
 import { toEmployeeWrapper, getUserRole, updateProfile } from '../../../../../store/profile/actions';
 import { MainContainer, AvatarContainer, MainFieldsContainer } from './FormFields/Form'
@@ -28,7 +28,12 @@ class UpdateUserForm extends React.Component {
     this.onGroupClose = this.onGroupClose.bind(this);
     this.onCancel = this.onCancel.bind(this);
 
-    this.onDialogShow = this.onDialogShow.bind(this);
+    this.onEmailChange = this.onEmailChange.bind(this);
+    this.onSendEmailChangeInstructions = this.onSendEmailChangeInstructions.bind(this);
+    this.onPasswordChange = this.onPasswordChange.bind(this);
+    this.onSendPasswordChangeInstructions = this.onSendPasswordChangeInstructions.bind(this);
+    this.onPhoneChange = this.onPhoneChange.bind(this);
+    this.onSendPhoneChangeInstructions = this.onSendPhoneChangeInstructions.bind(this);
     this.onDialogClose = this.onDialogClose.bind(this);
   }
 
@@ -41,12 +46,18 @@ class UpdateUserForm extends React.Component {
   mapPropsToState = (props) => {
     return {
       isLoading: false,
-      isDialogVisible: false,
       errors: {
         firstName: false,
         lastName: false,
       },
-      profile: toEmployeeWrapper(props.profile)
+      profile: toEmployeeWrapper(props.profile),
+      dialog: {
+        visible: false,
+        header: "",
+        body: "",
+        buttons: [],
+        newEmail: "",
+      }
     };
   }
 
@@ -87,7 +98,7 @@ class UpdateUserForm extends React.Component {
       lastName: !profile.lastName,
     };
     const hasError = errors.firstName || errors.lastName;
-    this.setState({errors: errors});
+    this.setState({ errors: errors });
     return !hasError;
   }
 
@@ -112,16 +123,102 @@ class UpdateUserForm extends React.Component {
     this.props.history.goBack();
   }
 
-  onDialogShow() {
-    this.setState({isDialogVisible: true})
+  onEmailChange(event) {
+    const dialog = { 
+      visible: true,
+      header: "Change email",
+      body: (
+        <Text.Body>
+          <span style={{display: "block", marginBottom: "8px"}}>The activation instructions will be sent to the entered email</span>
+          <TextInput
+            id="new-email"
+            scale={true}
+            isAutoFocussed={true}
+            value={event.target.value}
+            onChange={this.onEmailChange}
+          />
+        </Text.Body>
+      ),
+      buttons: [
+        <Button
+          key="SendBtn"
+          label="Send"
+          size="medium"
+          primary={true}
+          onClick={this.onSendEmailChangeInstructions}
+        />
+      ],
+      newEmail: event.target.value
+     };
+    this.setState({ dialog: dialog })
+  }
+
+  onSendEmailChangeInstructions() {
+    toastr.success("Context action: Change email");
+    this.onDialogClose();
+  }
+
+  onPasswordChange() {
+    const dialog = { 
+      visible: true,
+      header: "Change password",
+      body: (
+        <Text.Body>
+          Send the password change instructions to the <a href={`mailto:${this.state.profile.email}`}>${this.state.profile.email}</a> email address
+        </Text.Body>
+      ),
+      buttons: [
+        <Button
+          key="SendBtn"
+          label="Send"
+          size="medium"
+          primary={true}
+          onClick={this.onSendPasswordChangeInstructions}
+        />
+      ]
+     };
+    this.setState({ dialog: dialog })
+  }
+
+  onSendPasswordChangeInstructions() {
+    toastr.success("Context action: Change password");
+    this.onDialogClose();
+  }
+
+  onPhoneChange() {
+    const dialog = { 
+      visible: true,
+      header: "Change phone",
+      body: (
+        <Text.Body>
+          The instructions on how to change the user mobile number will be sent to the user email address
+        </Text.Body>
+      ),
+      buttons: [
+        <Button
+          key="SendBtn"
+          label="Send"
+          size="medium"
+          primary={true}
+          onClick={this.onSendPhoneChangeInstructions}
+        />
+      ]
+     };
+    this.setState({ dialog: dialog })
+  }
+
+  onSendPhoneChangeInstructions() {
+    toastr.success("Context action: Change phone");
+    this.onDialogClose();
   }
 
   onDialogClose() {
-    this.setState({isDialogVisible: false})
+    const dialog = { visible: false }; 
+    this.setState({ dialog: dialog })
   }
 
   render() {
-    const { isLoading, isDialogVisible, errors, profile } = this.state;
+    const { isLoading, errors, profile, dialog } = this.state;
     const { t } = this.props;
 
     return (
@@ -144,7 +241,7 @@ class UpdateUserForm extends React.Component {
               inputValue={profile.email}
               buttonText={t("ChangeButton")}
               buttonIsDisabled={isLoading}
-              buttonOnClick={this.onDialogShow}
+              buttonOnClick={this.onEmailChange}
               buttonTabIndex={1}
             />
             <TextChangeField
@@ -153,7 +250,7 @@ class UpdateUserForm extends React.Component {
               inputValue={profile.password}
               buttonText={t("ChangeButton")}
               buttonIsDisabled={isLoading}
-              buttonOnClick={this.onDialogShow}
+              buttonOnClick={this.onPasswordChange}
               buttonTabIndex={2}
             />
             <TextChangeField
@@ -162,7 +259,7 @@ class UpdateUserForm extends React.Component {
               inputValue={profile.phone}
               buttonText={t("ChangeButton")}
               buttonIsDisabled={isLoading}
-              buttonOnClick={this.onDialogShow}
+              buttonOnClick={this.onPhoneChange}
               buttonTabIndex={3}
             />
             <TextField
@@ -257,10 +354,10 @@ class UpdateUserForm extends React.Component {
         </div>
 
         <ModalDialog
-          visible={isDialogVisible}
-          headerContent={"Change password"}
-          bodyContent={<Text.Body>Send the password change instruction to the <a href="mailto:asc@story.book">asc@story.book</a> email address</Text.Body>}
-          footerContent={<Button key="SendBtn" label="Send" size="medium" primary={true} onClick={this.onDialogClose} />}
+          visible={dialog.visible}
+          headerContent={dialog.header}
+          bodyContent={dialog.body}
+          footerContent={dialog.buttons}
           onClose={this.onDialogClose}
         />
       </>

From 0b0f3fd86f9fce39134f5554af0c9ac3f11555d4 Mon Sep 17 00:00:00 2001
From: NikolayRechkin <nikolaynikcher@gmail.com>
Date: Fri, 6 Sep 2019 10:12:54 +0300
Subject: [PATCH 32/37] web: components: created a new combobox for sorting

---
 .../src/components/filter-input/index.js      |  56 +++++----
 .../components/filter-input/sort-combobox.js  | 108 ++++++++++++++++--
 2 files changed, 133 insertions(+), 31 deletions(-)

diff --git a/web/ASC.Web.Components/src/components/filter-input/index.js b/web/ASC.Web.Components/src/components/filter-input/index.js
index e29aa4543f..daea856aca 100644
--- a/web/ASC.Web.Components/src/components/filter-input/index.js
+++ b/web/ASC.Web.Components/src/components/filter-input/index.js
@@ -100,7 +100,7 @@ class FilterInput extends React.Component {
         }
 
         this.state = {
-            sortDirection: props.selectedFilterData.sortDirection === "asc" ? true : false,
+            sortDirection: props.selectedFilterData.sortDirection === "desc" ? true : false,
             sortId: props.getSortData().findIndex(x => x.key === props.selectedFilterData.sortId) != -1 ? props.selectedFilterData.sortId : props.getSortData().length > 0 ? props.getSortData()[0].key : "",
             searchText: props.selectedFilterData.inputValue || props.value,
 
@@ -114,9 +114,10 @@ class FilterInput extends React.Component {
 
         this.onClickSortItem = this.onClickSortItem.bind(this);
         this.onSortDirectionClick = this.onSortDirectionClick.bind(this);
+        this.onChangeSortDirection = this.onChangeSortDirection.bind(this);
         this.onSearch = this.onSearch.bind(this);
         this.onChangeFilter = this.onChangeFilter.bind(this);
-        
+
         this.onSearchChanged = this.onSearchChanged.bind(this);
 
         this.getDefaultSelectedIndex = this.getDefaultSelectedIndex.bind(this);
@@ -139,6 +140,10 @@ class FilterInput extends React.Component {
             hideFilterItems: []
         })
     }
+    onChangeSortDirection(key) {
+        this.onFilter(this.state.filterValues, this.state.sortId, !!key ? "desc" : "asc");
+        this.setState({ sortDirection: !!key });
+    }
     getDefaultSelectedIndex() {
         const sortData = this.props.getSortData();
         if (sortData.length > 0) {
@@ -147,21 +152,21 @@ class FilterInput extends React.Component {
         }
         return 0;
     }
-    onClickSortItem(item) {
-        this.setState({ sortId: item.key });
-        this.onFilter(this.state.filterValues, item.key, this.state.sortDirection ? "asc" : "desc");
+    onClickSortItem(key) {
+        this.setState({ sortId: key });
+        this.onFilter(this.state.filterValues, key, this.state.sortDirection ? "desc" : "asc");
     }
     onSortDirectionClick() {
 
-        this.onFilter(this.state.filterValues, this.state.sortId, !this.state.sortDirection ? "asc" : "desc");
+        this.onFilter(this.state.filterValues, this.state.sortId, !this.state.sortDirection ? "desc" : "asc");
         this.setState({ sortDirection: !this.state.sortDirection });
     }
     onSearchChanged(value) {
         this.setState({ searchText: value });
-        this.onFilter(this.state.filterValues, this.state.sortId, this.state.sortDirection ? "asc" : "desc",value);
+        this.onFilter(this.state.filterValues, this.state.sortId, this.state.sortDirection ? "desc" : "asc", value);
     }
     onSearch(result) {
-        this.onFilter(result.filterValues, this.state.sortId, this.state.sortDirection ? "asc" : "desc");
+        this.onFilter(result.filterValues, this.state.sortId, this.state.sortDirection ? "desc" : "asc");
     }
     getFilterData() {
         const _this = this;
@@ -181,12 +186,12 @@ class FilterInput extends React.Component {
     }
     clearFilter() {
         this.setState({
-            searchText:'',
+            searchText: '',
             filterValues: [],
             openFilterItems: [],
             hideFilterItems: []
         });
-        this.onFilter([], this.state.sortId, this.state.sortDirection ? "asc" : "desc", '');
+        this.onFilter([], this.state.sortId, this.state.sortDirection ? "desc" : "asc", '');
     }
     updateFilter(inputFilterItems) {
         const currentFilterItems = inputFilterItems || cloneObjectsArray(this.state.filterValues);
@@ -223,7 +228,7 @@ class FilterInput extends React.Component {
                 openFilterItems: newOpenFilterItems,
                 hideFilterItems: newHideFilterItems
             });
-            
+
         } else {
             this.setState({
                 openFilterItems: currentFilterItems.slice(),
@@ -247,7 +252,7 @@ class FilterInput extends React.Component {
             item.key = item.key.replace(item.group + "_", '');
             return item;
         })
-        this.onFilter(filterValues.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "asc" : "desc");
+        this.onFilter(filterValues.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "desc" : "asc");
     }
     onFilter(filterValues, sortId, sortDirection, searchText) {
         let cloneFilterValues = cloneObjectsArray(filterValues);
@@ -267,14 +272,14 @@ class FilterInput extends React.Component {
             searchText: result.inputValue,
             filterValues: result.filterValues,
         });
-        this.onFilter(result.filterValues, this.state.sortId, this.state.sortDirection ? "asc" : "desc", result.inputValue);
+        this.onFilter(result.filterValues, this.state.sortId, this.state.sortDirection ? "desc" : "asc", result.inputValue);
     }
     onFilterRender() {
         if (this.isResizeUpdate) {
             this.isResizeUpdate = false;
         }
 
-        if(this.searchWrapper.current && this.filterWrapper.current){
+        if (this.searchWrapper.current && this.filterWrapper.current) {
             const fullWidth = this.searchWrapper.current.getBoundingClientRect().width;
             const filterWidth = this.filterWrapper.current.getBoundingClientRect().width;
             if (fullWidth <= this.minWidth || filterWidth > fullWidth / 2) this.updateFilter();
@@ -325,7 +330,7 @@ class FilterInput extends React.Component {
                     item.key = item.key.replace(item.group + "_", '');
                     return item;
                 })
-                this.onFilter(clone.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "asc" : "desc");
+                this.onFilter(clone.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "desc" : "asc");
                 this.setState({
                     filterValues: currentFilterItems,
                     openFilterItems: currentFilterItems,
@@ -361,14 +366,14 @@ class FilterInput extends React.Component {
                 item.key = item.key.replace(item.group + "_", '');
                 return item;
             })
-            this.onFilter(clone.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "asc" : "desc");
+            this.onFilter(clone.filter(item => item.key != '-1'), this.state.sortId, this.state.sortDirection ? "desc" : "asc");
         }
 
     }
-    
+
     componentDidMount() {
         window.addEventListener('resize', this.throttledResize);
-        if(this.state.filterValues.length > 0) this.updateFilter();
+        if (this.state.filterValues.length > 0) this.updateFilter();
     }
     componentWillUnmount() {
         window.removeEventListener('resize', this.throttledResize);
@@ -382,7 +387,7 @@ class FilterInput extends React.Component {
             }
             this.setState(
                 {
-                    sortDirection: nextProps.selectedFilterData.sortDirection === "asc" ? true : false,
+                    sortDirection: nextProps.selectedFilterData.sortDirection === "desc" ? true : false,
                     sortId: this.props.getSortData().findIndex(x => x.key === nextProps.selectedFilterData.sortId) != -1 ? nextProps.selectedFilterData.sortId : "",
                     filterValues: internalFilterData,
                     searchText: nextProps.selectedFilterData.inputValue || this.props.value
@@ -456,10 +461,13 @@ class FilterInput extends React.Component {
                 <SortComboBox
                     options={this.props.getSortData()}
                     isDisabled={this.props.isDisabled}
-                    onSelect={this.onClickSortItem}
+                    onChangeSortId={this.onClickSortItem}
+                    onChangeSortDirection={this.onChangeSortDirection}
                     selectedOption={this.props.getSortData().length > 0 ? this.props.getSortData().find(x => x.key === this.state.sortId) : {}}
                     onButtonClick={this.onSortDirectionClick}
-                    sortDirection={this.state.sortDirection}
+                    sortDirection={+this.state.sortDirection}
+                    directionAscLabel={this.props.directionAscLabel}
+                    directionDescLabel={this.props.directionDescLabel}
                 />
             </StyledFilterInput>
 
@@ -470,6 +478,8 @@ class FilterInput extends React.Component {
 FilterInput.protoTypes = {
     autoRefresh: PropTypes.bool,
     selectedFilterData: PropTypes.object,
+    directionAscLabel: PropTypes.string,
+    directionDescLabel: PropTypes.string
 };
 
 FilterInput.defaultProps = {
@@ -479,7 +489,9 @@ FilterInput.defaultProps = {
         sortId: '',
         filterValues: [],
         searchText: ''
-    }
+    },
+    directionAscLabel: 'A-Z',
+    directionDescLabel: 'Z-A'
 };
 
 export default FilterInput;
\ No newline at end of file
diff --git a/web/ASC.Web.Components/src/components/filter-input/sort-combobox.js b/web/ASC.Web.Components/src/components/filter-input/sort-combobox.js
index 1f51c5a08e..1234f7ce2e 100644
--- a/web/ASC.Web.Components/src/components/filter-input/sort-combobox.js
+++ b/web/ASC.Web.Components/src/components/filter-input/sort-combobox.js
@@ -2,37 +2,111 @@ import React from 'react';
 import isEqual from 'lodash/isEqual';
 import ComboBox from '../combobox'
 import IconButton from '../icon-button';
+import DropDownItem from '../drop-down-item';
+import RadioButtonGroup from '../radio-button-group'
 import styled from 'styled-components';
+import PropTypes from 'prop-types';
 
 const StyledIconButton = styled.div`
-    transform: ${state => state.sortDirection ? 'scale(1, -1)' : 'scale(1)'};
+    transform: ${state => !state.sortDirection ? 'scale(1, -1)' : 'scale(1)'};
 `;
 const StyledComboBox = styled(ComboBox)`
   display: block;
   float: left;
   width: 20%;
   margin-left: 8px;
+  .display-block{
+      display: block;
+  }
 `;
+
 class SortComboBox extends React.Component {
     constructor(props) {
         super(props);
-        this.onSelect = this.onSelect.bind(this);
+
+        this.state = {
+            sortDirection: this.props.sortDirection
+        }
+        this.onChangeSortId = this.onChangeSortId.bind(this);
+        this.onChangeSortDirection = this.onChangeSortDirection.bind(this);
+        this.onButtonClick = this.onButtonClick.bind(this);
+
     }
-    onSelect(item) {
-        this.props.onSelect(item);
+    onButtonClick() {
+        typeof this.props.onChangeSortDirection === 'function' && this.props.onChangeSortDirection(+(this.state.sortDirection === 0 ? 1 : 0));
+        this.setState({
+            sortDirection: this.state.sortDirection === 0 ? 1 : 0
+        });
+    }
+
+    onChangeSortId(e) {
+        typeof this.props.onChangeSortId === 'function' && this.props.onChangeSortId(e.target.value);
+    }
+    onChangeSortDirection(e) {
+        this.setState({
+            sortDirection: +e.target.value
+        });
+        typeof this.props.onChangeSortDirection === 'function' && this.props.onChangeSortDirection(+e.target.value);
+
     }
     shouldComponentUpdate(nextProps, nextState) {
-        return !isEqual(this.props, nextProps);
+        if (this.props.sortDirection !== nextProps.sortDirection) {
+            this.setState({
+                sortDirection: nextProps.sortDirection
+            });
+            return true;
+        }
+        return (!isEqual(this.props, nextProps) || !isEqual(this.state, nextState));
     }
     render() {
+        let sortArray = this.props.options.map(function (item) {
+            item.value = item.key
+            return item;
+        });
+        let sortDirectionArray = [
+            { value: '0', label: this.props.directionAscLabel },
+            { value: '1', label: this.props.directionDescLabel }
+        ];
+
+        const advancedOptions = (
+            <>
+                <DropDownItem>
+                    <RadioButtonGroup
+                        className="display-block"
+                        onClick={this.onChangeSortDirection}
+                        isDisabled={this.props.isDisabled}
+                        selected={this.state.sortDirection.toString()}
+                        spacing={0}
+                        name={'direction'}
+                        options={sortDirectionArray}
+                    />
+                </DropDownItem>
+                <DropDownItem isSeparator />
+                <DropDownItem>
+                    <RadioButtonGroup
+                        className="display-block"
+                        onClick={this.onChangeSortId}
+                        isDisabled={this.props.isDisabled}
+                        selected={this.props.selectedOption.key}
+                        spacing={0}
+                        name={'sort'}
+                        options={sortArray}
+                    />
+                </DropDownItem>
+            </>
+        );
         return (
             <StyledComboBox
-                options={this.props.options}
+                options={[]}
+                advancedOptions={advancedOptions}
                 isDisabled={this.props.isDisabled}
-                onSelect={this.onSelect}
                 selectedOption={this.props.selectedOption}
+                scaled={false}
+                size="content"
+                directionX="right"
+
             >
-                <StyledIconButton sortDirection={this.props.sortDirection}>
+                <StyledIconButton sortDirection={!!this.state.sortDirection}>
                     <IconButton
                         color={"#D8D8D8"}
                         hoverColor={"#333"}
@@ -41,7 +115,7 @@ class SortComboBox extends React.Component {
                         iconName={'ZASortingIcon'}
                         isFill={true}
                         isDisabled={this.props.isDisabled}
-                        onClick={this.props.onButtonClick}
+                        onClick={this.onButtonClick}
                     />
                 </StyledIconButton>
             </StyledComboBox>
@@ -49,4 +123,20 @@ class SortComboBox extends React.Component {
     }
 }
 
+SortComboBox.propTypes = {
+    isDisabled: PropTypes.bool,
+    sortDirection: PropTypes.number,
+    onChangeSortId: PropTypes.func,
+    onChangeSortDirection: PropTypes.func,
+    onButtonClick: PropTypes.func,
+    directionAscLabel: PropTypes.string,
+    directionDescLabel: PropTypes.string
+}
+
+SortComboBox.defaultProps = {
+    isDisabled: false,
+    sortDirection: 0
+}
+
+
 export default SortComboBox;
\ No newline at end of file

From a5953f11df7114b02bd628f539712aff8ce3adb2 Mon Sep 17 00:00:00 2001
From: NikolayRechkin <nikolaynikcher@gmail.com>
Date: Fri, 6 Sep 2019 11:20:13 +0300
Subject: [PATCH 33/37] web: People: filter fixed

---
 .../Client/src/components/pages/Home/Section/Filter/index.js | 2 ++
 .../src/components/pages/Home/locales/en/translation.json    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js b/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
index c0f120ed68..2027dade0a 100644
--- a/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
+++ b/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
@@ -198,6 +198,8 @@ const SectionFilterContent = ({
       getSortData={getSortData.bind(this, t)}
       selectedFilterData={selectedFilterData}
       onFilter={onFilter}
+      directionAscLabel={t("DirectionAscLabel")}
+      directionDescLabel={t("DirectionDescLabel")}
     />
   );
 };
diff --git a/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json b/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json
index 0ac9a81f25..4ab66333f6 100644
--- a/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json
+++ b/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json
@@ -47,5 +47,8 @@
   "CustomMakeGuest": "Make {{typeGuest, lowercase}}",
   "CustomDepartment": "{{department}}",
   "CountPerPage": "{{count}} per page",
-  "PageOfTotalPage": "{{page}} of {{totalPage}}"
+  "PageOfTotalPage": "{{page}} of {{totalPage}}",
+
+  "DirectionAscLabel":"A-Z",
+  "DirectionDescLabel":"Z-A"
 }
\ No newline at end of file

From 90f25381ca2aa17a618856d7ec1762c3f6f8528b Mon Sep 17 00:00:00 2001
From: NikolayRechkin <nikolaynikcher@gmail.com>
Date: Fri, 6 Sep 2019 11:21:01 +0300
Subject: [PATCH 34/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 22665979b6..4c4633538a 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",

From 09384729d935f3b97dbe2c2117f1cd2ddf441067 Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Fri, 6 Sep 2019 11:50:58 +0300
Subject: [PATCH 35/37] Web.Client: Confirm: moved email field

---
 .../src/components/pages/Confirm/index.js     | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
index c2e052d316..be04423a3b 100644
--- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js
@@ -115,31 +115,6 @@ const Confirm = (props) => {
                 </Col>
             </Row>
 
-            <Row className='login-row'>
-                <Col sm="12" md={mdOptions}>
-                    <TextInput
-                        type="email"
-                        id='email'
-                        name='email'
-                        value={email}
-                        placeholder={t('Email')}
-                        size='huge'
-                        scale={true}
-                        isAutoFocussed={true}
-                        tabIndex={1}
-                        autoComplete='email'
-                        isDisabled={isLoading}
-                        hasError={!emailValid}
-                        onChange={event => {
-                            setEmail(event.target.value);
-                            !emailValid && setEmailValid(true);
-                            errorText && setErrorText("");
-                        }}
-                        onKeyDown={event => onKeyPress(event.target)}
-                    />
-                </Col>
-            </Row>
-
             <Row className='login-row'>
                 <Col sm="12" md={mdOptions}>
                     <TextInput
@@ -149,7 +124,8 @@ const Confirm = (props) => {
                         placeholder={t('FirstName')}
                         size='huge'
                         scale={true}
-                        tabIndex={2}
+                        tabIndex={1}
+                        isAutoFocussed={true}
                         autoComplete='given-name'
                         isDisabled={isLoading}
                         hasError={!firstNameValid}
@@ -172,7 +148,7 @@ const Confirm = (props) => {
                         placeholder={t('LastName')}
                         size='huge'
                         scale={true}
-                        tabIndex={3}
+                        tabIndex={2}
                         autoComplete='family-name'
                         isDisabled={isLoading}
                         hasError={!lastNameValid}
@@ -186,6 +162,30 @@ const Confirm = (props) => {
                 </Col>
             </Row>
 
+            <Row className='login-row'>
+                <Col sm="12" md={mdOptions}>
+                    <TextInput
+                        type="email"
+                        id='email'
+                        name='email'
+                        value={email}
+                        placeholder={t('Email')}
+                        size='huge'
+                        scale={true}
+                        tabIndex={3}
+                        autoComplete='email'
+                        isDisabled={isLoading}
+                        hasError={!emailValid}
+                        onChange={event => {
+                            setEmail(event.target.value);
+                            !emailValid && setEmailValid(true);
+                            errorText && setErrorText("");
+                        }}
+                        onKeyDown={event => onKeyPress(event.target)}
+                    />
+                </Col>
+            </Row>
+
             <Row className='login-row'>
                 <Col sm="12" md={mdOptions}>
                     <PasswordInput
@@ -196,6 +196,7 @@ const Confirm = (props) => {
                         size='huge'
                         scale={true}
                         tabIndex={4}
+                        maxLength={30}
                         hasError={!passwordValid}
                         onChange={event => {
                             setPassword(event.target.value);
@@ -207,7 +208,7 @@ const Confirm = (props) => {
                         clipEmailResource={`${t('Email')}: `}
                         clipPasswordResource={`${t('InvitePassword')}: `}
                         tooltipPasswordTitle={`${t('ErrorPasswordMessage')}:`}
-                        tooltipPasswordLength={`${t('ErrorPasswordLength', { fromNumber: 6, toNumber:30 })}:`}
+                        tooltipPasswordLength={`${t('ErrorPasswordLength', { fromNumber: 6, toNumber: 30 })}:`}
                         tooltipPasswordDigits={t('ErrorPasswordNoDigits')}
                         tooltipPasswordCapital={t('ErrorPasswordNoUpperCase')}
                         tooltipPasswordSpecial={`${t('ErrorPasswordNoSpecialSymbols')} (!@#$%^&*)`}

From 75fbc89d086e9b0970b4e14a7c049ffefb76c0d5 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 6 Sep 2019 11:54:19 +0300
Subject: [PATCH 36/37] Web: Components: added new library react-text-mask,
 added new props to text-input and input-block, fixed calendar render

---
 web/ASC.Web.Components/package.json           |   1 +
 .../src/components/calendar-new/date-input.js |  79 +++++-----
 .../src/components/calendar-new/index.js      | 137 ++++++++++++------
 .../src/components/input-block/index.js       |   7 +-
 .../src/components/text-input/index.js        |   9 +-
 web/ASC.Web.Components/yarn.lock              |   7 +
 .../stories/calendar/calendar/README.md       |  18 +--
 .../stories/input/input-block/README.md       |   6 +-
 .../input/input-block/index.stories.js        |   2 +
 .../stories/input/text/base/README.md         |   5 +-
 .../stories/input/text/base/index.stories.js  |   1 +
 .../stories/input/toggle-button/README.md     |   2 +-
 web/ASC.Web.Storybook/yarn.lock               |  35 ++---
 13 files changed, 187 insertions(+), 122 deletions(-)

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index e11d05c97d..e219660e2d 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -36,6 +36,7 @@
     "react-custom-scrollbars": "^4.2.1",
     "react-datepicker": "^2.8.0",
     "react-lifecycles-compat": "^3.0.4",
+    "react-text-mask": "^5.4.3",
     "react-toastify": "^5.3.2",
     "react-virtualized-auto-sizer": "^1.0.2",
     "react-window": "^1.8.5",
diff --git a/web/ASC.Web.Components/src/components/calendar-new/date-input.js b/web/ASC.Web.Components/src/components/calendar-new/date-input.js
index 83ae72fb85..d89c6057f1 100644
--- a/web/ASC.Web.Components/src/components/calendar-new/date-input.js
+++ b/web/ASC.Web.Components/src/components/calendar-new/date-input.js
@@ -8,10 +8,7 @@ import NewCalendar from '../calendar-new';
 import moment from 'moment/min/moment-with-locales';
 import { handleAnyClick } from '../../utils/event';
 
-
-const DateInputStyle = styled.div`
-
-`;
+const DateInputStyle = styled.div``;
 
 class DatePicker extends Component {
     constructor(props) {
@@ -30,6 +27,7 @@ class DatePicker extends Component {
         isOpen: this.props.isOpen,
         selectedDate: new Date(moment(this.props.selectedDate, this.format)),
         value: moment(this.props.selectedDate).format('L'),
+        email: this.props.email
     };
 
     handleClick = (e) => {
@@ -37,19 +35,20 @@ class DatePicker extends Component {
     }
 
     onIconClick = (isOpen) => {
-        //console.log("Show calendar please");
         this.setState({ isOpen: isOpen });
     };
 
-    handleChange(e) {
-        const format = moment.localeData().longDateFormat('L');
-        let date = new Date(moment(e.target.value, format));
+    handleChange = (e) => {
+        if (this.state.value != e.target.value) {
+            const format = moment.localeData().longDateFormat('L');
+            let date = new Date(moment(e.target.value, format));
 
-        if (!this.isValidDate(date)) { date = this.state.selectedDate; }
-        if (this.validationDate(date)) {
-            this.props.onChange && this.props.onChange(date);
+            this.setState({ value: e.target.value });
+            if (!isNaN(date) && this.validationDate(date)) {
+                this.props.onChange && this.props.onChange(date);
+                this.setState({ selectedDate: date })
+            }
         }
-        this.setState({ value: e.target.value, selectedDate: date })
     }
 
     onChange = (value) => {
@@ -57,10 +56,6 @@ class DatePicker extends Component {
         this.setState({ selectedDate: value, value: moment(value).format('L') })
     }
 
-    isValidDate = (date) => {
-        return date instanceof Date && !isNaN(date);
-    }
-
     validationDate = (date) => {
         const minDate = this.props.minDate;
         const maxDate = this.props.maxDate;
@@ -82,32 +77,35 @@ class DatePicker extends Component {
         }
 
         if (this.props.selectedDate !== prevProps.selectedDate ||
-            this.props.isOpen !== prevProps.isOpen || 
-            this.props.locale != prevProps.locale) {
+            this.props.locale !== prevProps.locale ||
+            this.props.isOpen !== prevProps.isOpen) {
             this.setState({
-                selectedDate: this.props.selectedDate,
                 isOpen: this.props.isOpen,
+                selectedDate: this.props.selectedDate,
                 value: moment(this.props.selectedDate).format('L')
             });
         }
     }
 
-    /*formatDate = () => {
-
+    /*onClick = (e) => {
+        if (this.ref.current.contains(e.target)) { console.log("contains"); }
+        else { console.log("ne contains"); }
     }*/
+    //onFocus = () => { console.log("Focus"); }
+    //onBlur = () => { console.log("Blur"); }
+
 
     render() {
-
         //console.log("Date-picker render");
         const isDisabled = this.props.isDisabled;
         const isReadOnly = this.props.isReadOnly;
         const hasError = this.props.hasError;
         const hasWarning = this.props.hasWarning;
 
-        this.validationDate(this.state.selectedDate);
+        const symbol = '/';
 
         return (
-            <DateInputStyle ref={this.ref} >
+            <DateInputStyle /*onFocus={this.onFocus} onBlur={this.onBlur}*/ ref={this.ref} >
                 <InputBlock
                     isDisabled={isDisabled}
                     isReadOnly={isReadOnly}
@@ -116,19 +114,28 @@ class DatePicker extends Component {
                     iconName={"CalendarIcon"}
                     onIconClick={this.onIconClick.bind(this, !this.state.isOpen)}
                     value={this.state.value}
-                    onChange={this.handleChange.bind(this)}
+                    onChange={this.handleChange}
                     placeholder={moment.localeData().longDateFormat('L')}
+                    mask={[/\d/, /\d/, symbol, /\d/, /\d/, symbol, /\d/, /\d/, /\d/, /\d/]}
+                    keepCharPositions={true}
+                //guide={true}
+                //showMask={true}
                 />
-                <Col>
-                    <DropDown opened={this.state.isOpen}>
-                        {<NewCalendar
-                            {...this.props}
-                            openToDate={this.state.selectedDate}
-                            selectedDate={this.state.selectedDate}
-                            onChange={this.onChange}
-                        />}
-                    </DropDown>
-                </Col>
+
+                {this.state.isOpen ?
+                    <Col>
+                        <DropDown opened={this.state.isOpen}>
+                            {<NewCalendar
+                                {...this.props}
+                                openToDate={this.state.selectedDate}
+                                selectedDate={this.state.selectedDate}
+                                onChange={this.onChange}
+                            />}
+                        </DropDown>
+                    </Col>
+                    :
+                    null
+                }
             </DateInputStyle>
         );
     }
@@ -154,4 +161,4 @@ DatePicker.defaultProps = {
     maxDate: new Date(new Date().getFullYear() + 1, 1, 1),
 }
 
-export default DatePicker;
+export default DatePicker;
\ No newline at end of file
diff --git a/web/ASC.Web.Components/src/components/calendar-new/index.js b/web/ASC.Web.Components/src/components/calendar-new/index.js
index 36e2d1f475..3cd10436ee 100644
--- a/web/ASC.Web.Components/src/components/calendar-new/index.js
+++ b/web/ASC.Web.Components/src/components/calendar-new/index.js
@@ -4,6 +4,7 @@ import styled, { css } from 'styled-components';
 import ComboBox from '../combobox';
 import moment from 'moment/min/moment-with-locales';
 import { Text } from "../text";
+import isEqual from 'lodash/isEqual';
 
 const HoverStyle = css`
     &:hover {
@@ -89,13 +90,13 @@ const Weekday = styled.div`
 `;
 
 const Weekdays = styled.div`
-    width: ${props => props.size === 'base' ? '265px;' : '310px;'}
+    width: ${props => props.size === 'base' ? '265px' : '310px'};
     display: flex;
     margin-bottom: -5px;
 `;
 
 const Month = styled.div`
-    width: ${props => props.size === 'base' ? '267px;' : '303px;'}
+    width: ${props => props.size === 'base' ? '267px' : '303px'};
 `;
 
 const Days = styled.div`
@@ -163,8 +164,15 @@ class Calendar extends Component {
     }
 
     getListMonth = () => {
-        const minDate = this.props.minDate;
-        const maxDate = this.props.maxDate;
+
+        const minDateYear = this.props.minDate.getFullYear();
+        const minDateMonth = this.props.minDate.getMonth();
+
+        const maxDateYear = this.props.maxDate.getFullYear();
+        const maxDateMonth = this.props.maxDate.getMonth();
+
+        const openToDateYear = this.state.openToDate.getFullYear();
+
         const months = this.state.months;
         let disabled = false;
         const listMonths = [];
@@ -175,17 +183,17 @@ class Calendar extends Component {
             i++;
         }
 
-        if (this.state.openToDate.getFullYear() === minDate.getFullYear()) {
+        if (openToDateYear === minDateYear) {
             i = 0;
-            while (i != minDate.getMonth()) {
+            while (i != minDateMonth) {
                 listMonths[i].disabled = true;
                 i++;
             }
         }
 
-        if (this.state.openToDate.getFullYear() === maxDate.getFullYear()) {
+        else if (openToDateYear === maxDateYear) {
             i = 11;
-            while (i != maxDate.getMonth()) {
+            while (i != maxDateMonth) {
                 listMonths[i].disabled = true;
                 i--;
             }
@@ -194,14 +202,15 @@ class Calendar extends Component {
         return listMonths;
     }
 
-    getCurrentMonth = () => {
-        const openToDate = this.state.openToDate;
-        const months = this.getListMonth();
-        let selectedMonth = months.find(x => x.key == openToDate.getMonth());
+    getCurrentMonth = (months) => {
+        const openToDateMonth = this.state.openToDate.getMonth();
+        const openToDateYear = this.state.openToDate.getFullYear();
+
+        let selectedMonth = months.find(x => x.key == openToDateMonth);
 
         if (selectedMonth.disabled === true) {
             selectedMonth = months.find(x => x.disabled === false);
-            const date = new Date(openToDate.getFullYear(), selectedMonth.key, 1);
+            const date = new Date(openToDateYear, selectedMonth.key, 1);
             this.state.openToDate = date;
         }
         return selectedMonth;
@@ -220,11 +229,12 @@ class Calendar extends Component {
             yearList.push({ key, label: label });
             i++;
         }
-        return yearList;
+        return yearList.reverse();
     }
 
-    getCurrentYear = () => {
-        return this.getArrayYears().find(x => x.key == this.state.openToDate.getFullYear());
+    getCurrentYear = (arrayYears) => {
+        const openToDateYear = this.state.openToDate.getFullYear()
+        return arrayYears.find(x => x.key == openToDateYear);
     }
 
     formatSelectedDate = (date) => {
@@ -278,25 +288,34 @@ class Calendar extends Component {
         const color = { color: "inherit;" };
 
         const openToDate = this.state.openToDate;
-        const maxDate = this.props.maxDate;
-        const minDate = this.props.minDate;
+
+        const openToDateMonth = openToDate.getMonth();
+        const openToDateYear = openToDate.getFullYear();
+
+        const maxDateMonth = this.props.maxDate.getMonth();
+        const maxDateYear = this.props.maxDate.getFullYear();
+        const maxDateDay = this.props.maxDate.getDate();
+
+        const minDateMonth = this.props.minDate.getMonth();
+        const minDateYear = this.props.minDate.getFullYear();
+        const minDateDay = this.props.minDate.getDate();
 
         //Disable preview month
         let disableClass = null;
-        if (openToDate.getFullYear() === minDate.getFullYear() && openToDate.getMonth() === minDate.getMonth()) {
+        if (openToDateYear === minDateYear && openToDateMonth === minDateMonth) {
             disableClass = "calendar-month_disabled";
         }
 
         //Prev month
         let prevMonthDay = null;
-        if (openToDate.getFullYear() === minDate.getFullYear() && openToDate.getMonth() - 1 === minDate.getMonth()) {
-            prevMonthDay = minDate.getDate();
+        if (openToDateYear === minDateYear && openToDateMonth - 1 === minDateMonth) {
+            prevMonthDay = minDateDay;
         }
 
         //prev month + year
         let prevYearDay = null;
-        if (openToDate.getFullYear() === minDate.getFullYear() + 1 && openToDate.getMonth() === 0 && minDate.getMonth() === 11) {
-            prevYearDay = minDate.getDate();
+        if (openToDateYear === minDateYear + 1 && openToDateMonth === 0 && minDateMonth === 11) {
+            prevYearDay = minDateDay;
         }
 
         const size = this.props.size;
@@ -321,14 +340,14 @@ class Calendar extends Component {
         keys = 0;
         let maxDay, minDay;
         disableClass = null;
-        if (openToDate.getFullYear() === maxDate.getFullYear() && openToDate.getMonth() >= maxDate.getMonth()) {
-            if (openToDate.getMonth() === maxDate.getMonth()) { maxDay = maxDate.getDate(); }
+        if (openToDateYear === maxDateYear && openToDateMonth >= maxDateMonth) {
+            if (openToDateMonth === maxDateMonth) { maxDay = maxDateDay; }
             else { maxDay = null; }
         }
 
         //Disable min days in month
-        if (openToDate.getFullYear() === minDate.getFullYear() && openToDate.getMonth() >= minDate.getMonth()) {
-            if (openToDate.getMonth() === minDate.getMonth()) { minDay = minDate.getDate(); }
+        if (openToDateYear === minDateYear && openToDateMonth >= minDateMonth) {
+            if (openToDateMonth === minDateMonth) { minDay = minDateDay; }
             else { minDay = null; }
         }
 
@@ -363,20 +382,20 @@ class Calendar extends Component {
 
         //Disable next month days
         disableClass = null;
-        if (openToDate.getFullYear() === maxDate.getFullYear() && openToDate.getMonth() >= maxDate.getMonth()) {
+        if (openToDateYear === maxDateYear && openToDateMonth >= maxDateMonth) {
             disableClass = "calendar-month_disabled";
         }
 
         //next month + year 
         let nextYearDay = null;
-        if (openToDate.getFullYear() === maxDate.getFullYear() - 1 && openToDate.getMonth() === 11 && maxDate.getMonth() === 0) {
-            nextYearDay = maxDate.getDate();
+        if (openToDateYear === maxDateYear - 1 && openToDateMonth === 11 && maxDateMonth === 0) {
+            nextYearDay = maxDateDay;
         }
 
         //next month
         let nextMonthDay = null;
-        if (openToDate.getFullYear() === maxDate.getFullYear() && openToDate.getMonth() === maxDate.getMonth() - 1) {
-            nextMonthDay = maxDate.getDate();
+        if (openToDateYear === maxDateYear && openToDateMonth === maxDateMonth - 1) {
+            nextMonthDay = maxDateDay;
         }
 
         //Show neighboring days in next month
@@ -399,10 +418,8 @@ class Calendar extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        moment.locale(this.props.locale);
-        this.state.months = moment.months();
-        if (this.props.selectedDate !== prevProps.selectedDate ||
-            this.props.openToDate !== prevProps.openToDate) {
+        if (this.formatSelectedDate(this.props.selectedDate) != this.formatSelectedDate(prevProps.selectedDate) ||
+            this.formatDate(this.props.openToDate) != this.formatDate(prevProps.openToDate)) {
             this.setState({
                 selectedDate: this.props.selectedDate,
                 openToDate: this.props.openToDate
@@ -410,33 +427,59 @@ class Calendar extends Component {
         }
     }
 
+    shouldComponentUpdate(nextProps, nextState) {
+        if ((this.formatSelectedDate(this.props.selectedDate) !== this.formatSelectedDate(nextProps.selectedDate)) ||
+            (this.formatDate(this.props.openToDate) !== this.formatDate(nextProps.openToDate))) {
+            //console.log("shouldComponentUpdate");
+            //console.log("this.props.openToDate", this.formatDate(this.props.openToDate));
+            //console.log("nextProps.openToDate", this.formatDate(nextProps.openToDate));
+            //console.log("this.props.selectedDate", this.formatSelectedDate(this.props.selectedDate));
+            //console.log("nextProps.selectedDate", this.formatSelectedDate(nextProps.selectedDate));
+            this.setState({
+                selectedDate: nextProps.selectedDate,
+                openToDate: nextProps.openToDate
+            });
+            return true;
+        }
+        return (!isEqual(this.state, nextState));
+    }
+
     render() {
         //console.log("Calendar render");
 
+        moment.locale(this.props.locale);
+        this.state.months = moment.months();
         const isDisabled = this.props.isDisabled;
         const size = this.props.size;
-        const dropDownSizeMonth = this.getListMonth().length > 4 ? 184 : undefined;
-        const dropDownSizeYear = this.getListMonth().length > 4 ? 184 : undefined;
+        const themeColor = this.props.themeColor
+
+        const optionsMonth = this.getListMonth();
+        const selectedOptionMonth = this.getCurrentMonth(optionsMonth);
+        const dropDownSizeMonth = optionsMonth.length > 4 ? 184 : undefined;
+
+        const optionsYear = this.getArrayYears();
+        const selectedOptionYear = this.getCurrentYear(optionsYear);
+        const dropDownSizeYear = optionsYear.length > 4 ? 184 : undefined;
 
         return (
-            <CalendarContainer size={size}>
-                <CalendarStyle size={size} color={this.props.themeColor} isDisabled={isDisabled}>
+            <CalendarContainer size={size} >
+                <CalendarStyle size={size} color={themeColor} isDisabled={isDisabled}>
                     <ComboBoxStyle>
                         <ComboBox
                             scaled={true}
                             dropDownMaxHeight={dropDownSizeMonth}
-                            onSelect={this.onSelectMonth.bind(this)}
-                            selectedOption={this.getCurrentMonth()}
-                            options={this.getListMonth()}
+                            onSelect={this.onSelectMonth}
+                            selectedOption={selectedOptionMonth}
+                            options={optionsMonth}
                             isDisabled={isDisabled}
                         />
                         <ComboBoxDateStyle>
                             <ComboBox
                                 scaled={true}
                                 dropDownMaxHeight={dropDownSizeYear}
-                                onSelect={this.onSelectYear.bind(this)}
-                                selectedOption={this.getCurrentYear()}
-                                options={this.getArrayYears().reverse()}
+                                onSelect={this.onSelectYear}
+                                selectedOption={selectedOptionYear}
+                                options={optionsYear}
                                 isDisabled={isDisabled}
                             />
                         </ComboBoxDateStyle>
@@ -450,7 +493,7 @@ class Calendar extends Component {
                         </Days>
                     </Month>
                 </CalendarStyle>
-            </CalendarContainer>
+            </CalendarContainer >
         );
     }
 }
diff --git a/web/ASC.Web.Components/src/components/input-block/index.js b/web/ASC.Web.Components/src/components/input-block/index.js
index a584e3faf0..a95cd31320 100644
--- a/web/ASC.Web.Components/src/components/input-block/index.js
+++ b/web/ASC.Web.Components/src/components/input-block/index.js
@@ -102,6 +102,8 @@ const InputBlock = React.forwardRef((props, ref) => {
         scale={props.scale}
         onChange={onChange}
         withBorder={false}
+        mask={props.mask}
+        keepCharPositions={props.keepCharPositions}
       />
       {
         iconNames.includes(props.iconName)
@@ -130,6 +132,8 @@ InputBlock.propTypes = {
   maxLength: PropTypes.number,
   placeholder: PropTypes.string,
   tabIndex: PropTypes.number,
+  mask: PropTypes.array,
+  keepCharPositions: PropTypes.bool,
 
   size: PropTypes.oneOf(['base', 'middle', 'big', 'huge']),
   scale: PropTypes.bool,
@@ -175,7 +179,8 @@ InputBlock.defaultProps = {
   iconName: "",
   iconColor: "#ffffff",
   isIconFill: false,
-  isDisabled: false
+  isDisabled: false,
+  keepCharPositions: false
 }
 
 export default InputBlock
\ No newline at end of file
diff --git a/web/ASC.Web.Components/src/components/text-input/index.js b/web/ASC.Web.Components/src/components/text-input/index.js
index 46a8551ec7..0c4e0517f0 100755
--- a/web/ASC.Web.Components/src/components/text-input/index.js
+++ b/web/ASC.Web.Components/src/components/text-input/index.js
@@ -2,8 +2,10 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components';
 import commonInputStyle from '../text-input/common-input-styles';
+import MaskedInput from 'react-text-mask'
 
-const Input = ({ isAutoFocussed, isDisabled, isReadOnly, hasError, hasWarning, scale, withBorder,  ...props }) => <input {...props}/>;
+const Input = ({ isAutoFocussed, isDisabled, isReadOnly, hasError, hasWarning, scale, withBorder, keepCharPositions,  ...props }) => 
+    (props.mask != null) ? <MaskedInput keepCharPositions {...props}/> : <input {...props}/>;
 
 const StyledInput = styled(Input).attrs((props) => ({
     id: props.id,
@@ -86,6 +88,8 @@ TextInput.propTypes = {
     maxLength: PropTypes.number,
     placeholder: PropTypes.string,
     tabIndex: PropTypes.number,
+    mask: PropTypes.array,
+    keepCharPositions: PropTypes.bool,
 
     size: PropTypes.oneOf(['base', 'middle', 'big', 'huge']),
     scale: PropTypes.bool,
@@ -112,7 +116,8 @@ TextInput.defaultProps = {
     hasError: false,
     hasWarning: false,
     autoComplete: 'off',
-    withBorder: true
+    withBorder: true,
+    keepCharPositions: false
 }
 
 export default TextInput
diff --git a/web/ASC.Web.Components/yarn.lock b/web/ASC.Web.Components/yarn.lock
index d2644473c9..f99478b804 100644
--- a/web/ASC.Web.Components/yarn.lock
+++ b/web/ASC.Web.Components/yarn.lock
@@ -6863,6 +6863,13 @@ react-router@5.0.1:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
+react-text-mask@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/react-text-mask/-/react-text-mask-5.4.3.tgz#991efb4299e30c2e6c2c46d13f617169463e0d2d"
+  integrity sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=
+  dependencies:
+    prop-types "^15.5.6"
+
 react-toastify@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-5.3.2.tgz#9de4b426656587722f7e2f99f5f90e974ba5fee6"
diff --git a/web/ASC.Web.Storybook/stories/calendar/calendar/README.md b/web/ASC.Web.Storybook/stories/calendar/calendar/README.md
index 45ce1dfc1a..6c518a066b 100644
--- a/web/ASC.Web.Storybook/stories/calendar/calendar/README.md
+++ b/web/ASC.Web.Storybook/stories/calendar/calendar/README.md
@@ -11,16 +11,16 @@ import { NewCalendar } from 'asc-web-components';
 
 <NewCalendar
     onChange={date => {
-        action('Selected date')(date);
+    console.log('Selected date:', date);
     }}
-    disabled={boolean('disabled', false)}
-    themeColor={color('themeColor', '#ED7309')}
-    selectedDate={myDateKnob('selectedDate', new Date())}
-    openToDate={myDateKnob('openToDate', new Date())}
-    minDate={myDateKnob('minDate', new Date("1970/01/01"))}
-    maxDate={myDateKnob('maxDate', new Date("3000/01/01"))}
-    locale={select('location', locales, 'en')}
-    scaled = {boolean('scaled', false)}
+    disabled={false}
+    themeColor='#ED7309'
+    selectedDate={new Date()}
+    openToDate={new Date()}
+    minDate={new Date("1970/01/01")}
+    maxDate={new Date("3000/01/01")}
+    locale='ru'
+    scaled={false}
 />
 ```
 
diff --git a/web/ASC.Web.Storybook/stories/input/input-block/README.md b/web/ASC.Web.Storybook/stories/input/input-block/README.md
index 0bc5f40b58..4c4c7f4f92 100644
--- a/web/ASC.Web.Storybook/stories/input/input-block/README.md
+++ b/web/ASC.Web.Storybook/stories/input/input-block/README.md
@@ -13,7 +13,10 @@ InputBlock description
 #### Usage
 
 ```js
-<InputBlock iconName={"SearchIcon"} onIconClick={event => alert(event.target.value)} onChange={event => alert(event.target.value)} >
+const mask =[/\d/, /\d/, '/', /\d/, /\d/, '/', /\d/, /\d/, /\d/, /\d/];
+
+<InputBlock mask={mask} iconName={"SearchIcon"} onIconClick={event => alert(event.target.value)} 
+    onChange={event => alert(event.target.value)} >
     <Button size='base' isDisabled={false} onClick={() => alert('Button clicked')} label="OK" />
 </InputBlock>;
 ```
@@ -42,3 +45,4 @@ InputBlock description
 | `isIconFill`           | `bool`   |          |                                | `false` | Determines if icon fill is needed                                                                      |
 | `onIconClick`          | `func`   |    ✅    | -                              | -       | Will be triggered whenever an icon is clicked                                                          |
 | `iconSize`             | `number` |    ✅    | -                              | -       | Size icon                                                                                              |
+| `mask`                 | `array`   |    -  | -                   | -       | input text mask                                                                             |
diff --git a/web/ASC.Web.Storybook/stories/input/input-block/index.stories.js b/web/ASC.Web.Storybook/stories/input/input-block/index.stories.js
index af864b0192..9b185b4e59 100644
--- a/web/ASC.Web.Storybook/stories/input/input-block/index.stories.js
+++ b/web/ASC.Web.Storybook/stories/input/input-block/index.stories.js
@@ -72,6 +72,8 @@ storiesOf('Components|Input', module)
                 tabIndex={number('tabIndex', 1)}
                 iconSize={number('iconSize', 0)}
 
+                mask={text("mask", null)}
+
                 isDisabled={boolean('isDisabled', false)}
                 iconName={select('iconName', iconNames, 'SearchIcon')}
                 iconColor={color('iconColor', "#D0D5DA")}
diff --git a/web/ASC.Web.Storybook/stories/input/text/base/README.md b/web/ASC.Web.Storybook/stories/input/text/base/README.md
index 53df556ca3..7c7f97623d 100644
--- a/web/ASC.Web.Storybook/stories/input/text/base/README.md
+++ b/web/ASC.Web.Storybook/stories/input/text/base/README.md
@@ -13,7 +13,9 @@ Input description
 #### Usage
 
 ```js
-<TextInput value="text" onChange={event => alert(event.target.value)} />;
+const mask =[/\d/, /\d/, '/', /\d/, /\d/, '/', /\d/, /\d/, /\d/, /\d/];
+
+<TextInput mask={mask} value="text" onChange={event => alert(event.target.value)} />;
 ```
 
 #### Properties
@@ -37,6 +39,7 @@ Input description
 | `size`          | `string`        |          | `base`, `middle`, `big`, `huge` | `base` | Supported size of the input fields.                         |
 | `scale`           | `bool`   |    -     | -                            | -       | Indicates the input field has scale                                                                |
 | `withBorder`           | `bool`            |    -     | -                            | `true`  | Indicates that component contain border      |
+| `mask`                 | `array`   |    -  | -                   | -       | input text mask                                                                             |
 
 ### Main Functions and use cases are:
 
diff --git a/web/ASC.Web.Storybook/stories/input/text/base/index.stories.js b/web/ASC.Web.Storybook/stories/input/text/base/index.stories.js
index 4f6e3644c0..27bfd13f29 100644
--- a/web/ASC.Web.Storybook/stories/input/text/base/index.stories.js
+++ b/web/ASC.Web.Storybook/stories/input/text/base/index.stories.js
@@ -39,6 +39,7 @@ storiesOf('Components|Input', module)
             autoComplete={text('autoComplete', 'off')}
             tabIndex={number('tabIndex', 1)}
             withBorder={boolean('withBorder', true)}
+            mask={text("mask", null)}
             value={value}
             onChange={e => { 
               set(e.target.value);
diff --git a/web/ASC.Web.Storybook/stories/input/toggle-button/README.md b/web/ASC.Web.Storybook/stories/input/toggle-button/README.md
index b0218f792e..22eb9e5de5 100644
--- a/web/ASC.Web.Storybook/stories/input/toggle-button/README.md
+++ b/web/ASC.Web.Storybook/stories/input/toggle-button/README.md
@@ -9,7 +9,7 @@ Custom toggle button input
 ```js
 import { ToggleButton } from 'asc-web-components';
 
-<ToggleButton value="text" onChange={event => alert(event.target.value)}/>
+<ToggleButton value="text" onChange={event => console.log(event.target.value)}/>
 ```
 
 #### Properties
diff --git a/web/ASC.Web.Storybook/yarn.lock b/web/ASC.Web.Storybook/yarn.lock
index c306a679bc..8943b2f197 100644
--- a/web/ASC.Web.Storybook/yarn.lock
+++ b/web/ASC.Web.Storybook/yarn.lock
@@ -2360,15 +2360,15 @@ asap@~2.0.3, asap@~2.0.6:
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 "asc-web-components@file:../../packages/asc-web-components":
-  version "1.0.20"
+  version "1.0.33"
   dependencies:
     "@emotion/core" "10.0.16"
     prop-types "^15.7.2"
     rc-tree "^2.1.2"
     react-autosize-textarea "^7.0.0"
-    react-calendar "file:C:/Users/Daniil.Senkiv/AppData/Local/Yarn/Cache/v4/npm-asc-web-components-1.0.20-041f6336-a5f5-44c6-8c1a-64199d661907-1567085888431/packages/react-calendar/react-calendar-v2.13.2.tgz"
     react-custom-scrollbars "^4.2.1"
     react-datepicker "^2.8.0"
+    react-text-mask "^5.4.3"
     react-toastify "^5.3.2"
     react-virtualized-auto-sizer "^1.0.2"
     react-window "^1.8.5"
@@ -7881,11 +7881,6 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -8159,11 +8154,6 @@ merge-anything@^2.2.4:
   dependencies:
     is-what "^3.3.1"
 
-merge-class-names@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge-class-names/-/merge-class-names-1.2.0.tgz#cb30ecfc3bdbd96b6f76d0a98777907e5fbb3462"
-  integrity sha512-ifHxhC8DojHT1rG3PHCaJYInUqPd0WO+PxsaYDMkgy7RzfyOFtnlpr/hbhki+m/3R/ujIRVnZkD/AHjgjb5uhg==
-
 merge-deep@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
@@ -10412,16 +10402,6 @@ react-autosize-textarea@^7.0.0:
     line-height "^0.3.1"
     prop-types "^15.5.6"
 
-"react-calendar@file:../../packages/react-calendar/react-calendar-v2.13.2.tgz":
-  version "2.13.2"
-  resolved "file:../../packages/react-calendar/react-calendar-v2.13.2.tgz#4155ccd5dff8fcbb3c0c39430ff3d11d11c6c459"
-  dependencies:
-    lodash.once "^4.1.1"
-    merge-class-names "^1.1.1"
-    prop-types "^15.6.0"
-    react ">=15.5"
-    react-dom ">=15.5"
-
 react-clientside-effect@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"
@@ -10505,7 +10485,7 @@ react-docgen@^4.1.0:
     node-dir "^0.1.10"
     recast "^0.17.3"
 
-react-dom@>=15.5, react-dom@^16.8.3, react-dom@^16.9.0:
+react-dom@^16.8.3, react-dom@^16.9.0:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
   integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
@@ -10716,6 +10696,13 @@ react-syntax-highlighter@^8.0.1:
     prismjs "^1.8.4"
     refractor "^2.4.1"
 
+react-text-mask@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/react-text-mask/-/react-text-mask-5.4.3.tgz#991efb4299e30c2e6c2c46d13f617169463e0d2d"
+  integrity sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=
+  dependencies:
+    prop-types "^15.5.6"
+
 react-textarea-autosize@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445"
@@ -10762,7 +10749,7 @@ react-window@^1.8.5:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@>=15.5, react@^16.8.3, react@^16.9.0:
+react@^16.8.3, react@^16.9.0:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
   integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==

From e160157fc862b54a2a8d76c870edd2e487276dfb Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 6 Sep 2019 11:55:19 +0300
Subject: [PATCH 37/37] web: components: bump version

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

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 42de019145..c40f21cd7c 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.cjs.js",