Merged develop

cvat-ai · Jun 9, 2020 · 4a0df1a · 4a0df1a
2 parents 6c0edc6 + 5789199
commit 4a0df1a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed dataset filter item representation for imageless dataset items (<https://github.com/opencv/cvat/pull/1593>)
 - Fixed interpreter crash when trying to import `tensorflow` with no AVX instructions available (<https://github.com/opencv/cvat/pull/1567>)
 - Kibana wrong working time calculation with new annotation UI use (<https://github.com/opencv/cvat/pull/1654>)
+- Wrong rexex for account name validation (<https://github.com/opencv/cvat/pull/1667>)
+- Wrong description on register view for the username field (<https://github.com/opencv/cvat/pull/1667>)
+- Wrong resolution for resizing a shape (<https://github.com/opencv/cvat/pull/1667>)
 
 ### Security
 - SQL injection in Django `CVE-2020-9402` (<https://github.com/opencv/cvat/pull/1657>)

diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -1401,7 +1401,9 @@ export class CanvasViewImpl implements CanvasView, Listener {
 
         let shapeSizeElement: ShapeSizeElement | null = null;
         let resized = false;
-        (shape as any).resize().on('resizestart', (): void => {
+        (shape as any).resize({
+            snapToGrid: 0.1,
+        }).on('resizestart', (): void => {
             this.mode = Mode.RESIZE;
             if (state.shapeType === 'rectangle') {
                 shapeSizeElement = displayShapeSize(this.adoptedContent, this.adoptedText);

diff --git a/cvat-ui/src/components/register-page/register-form.tsx b/cvat-ui/src/components/register-page/register-form.tsx
@@ -11,7 +11,7 @@ import Checkbox from 'antd/lib/checkbox';
 
 import patterns from 'utils/validation-patterns';
 
-import { UserAgreement } from 'reducers/interfaces'
+import { UserAgreement } from 'reducers/interfaces';
 import { Row, Col } from 'antd/lib/grid';
 
 export interface UserConfirmation {
@@ -31,7 +31,7 @@ export interface RegisterData {
 
 type RegisterFormProps = {
     fetching: boolean;
-    userAgreements: UserAgreement[],
+    userAgreements: UserAgreement[];
     onSubmit(registerData: RegisterData): void;
 } & FormComponentProps;
 
@@ -83,7 +83,7 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
 
     private validateAgrement = (agreement: any, value: any, callback: any): void => {
         const { userAgreements } = this.props;
-        let isValid: boolean = true;
+        let isValid = true;
         for (const userAgreement of userAgreements) {
             if (agreement.field === userAgreement.name
                 && userAgreement.required && !value) {
@@ -107,18 +107,20 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
 
         form.validateFields((error, values): void => {
             if (!error) {
-                values.confirmations = []
+                const validatedFields = {
+                    ...values,
+                    confirmations: [],
+                };
 
                 for (const userAgreement of userAgreements) {
-
-                    values.confirmations.push({
+                    validatedFields.confirmations.push({
                         name: userAgreement.name,
-                        value: values[userAgreement.name]
+                        value: validatedFields[userAgreement.name],
                     });
-                    delete values[userAgreement.name];
+                    delete validatedFields[userAgreement.name];
                 }
 
-                onSubmit(values);
+                onSubmit(validatedFields);
             }
         });
     };
@@ -255,8 +257,7 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
 
     private renderUserAgreements(): JSX.Element[] {
         const { form, userAgreements } = this.props;
-        const getUserAgreementsElements = () =>
-        {
+        const getUserAgreementsElements = (): JSX.Element[] => {
             const agreementsList: JSX.Element[] = [];
             for (const userAgreement of userAgreements) {
                 agreementsList.push(
@@ -269,18 +270,24 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
                                 message: 'You must accept to continue!',
                             }, {
                                 validator: this.validateAgrement,
-                            }]
+                            }],
                         })(
                             <Checkbox>
-                                I read and accept the <a rel='noopener noreferrer' target='_blank'
-                                     href={ userAgreement.url }>{ userAgreement.displayText }</a>
-                            </Checkbox>
+                                I read and accept the
+                                <a
+                                    rel='noopener noreferrer'
+                                    target='_blank'
+                                    href={userAgreement.url}
+                                >
+                                    {userAgreement.displayText}
+                                </a>
+                            </Checkbox>,
                         )}
-                    </Form.Item>
+                    </Form.Item>,
                 );
             }
             return agreementsList;
-        }
+        };
 
         return getUserAgreementsElements();
     }

diff --git a/cvat-ui/src/utils/validation-patterns.ts b/cvat-ui/src/utils/validation-patterns.ts
@@ -26,17 +26,27 @@ const validationPatterns = {
 
     validateUsernameLength: {
         pattern: /(?=.{5,})/,
-        message: 'Username must have at least 8 characters',
+        message: 'Username must have at least 5 characters',
     },
 
     validateUsernameCharacters: {
         pattern: /^[a-zA-Z0-9_-]{5,}$/,
         message: 'Only characters (a-z), (A-Z), (0-9), -, _ are available',
     },
 
+    /*
+        \p{Pd} - dash connectors
+        \p{Pc} - connector punctuations
+        \p{Cf} - invisible formatting indicator
+        \p{L} - any alphabetic character
+        Useful links:
+        https://stackoverflow.com/questions/4323386/multi-language-input-validation-with-utf-8-encoding
+        https://stackoverflow.com/questions/280712/javascript-unicode-regexes
+        https://stackoverflow.com/questions/6377407/how-to-validate-both-chinese-unicode-and-english-name
+    */
     validateName: {
         // eslint-disable-next-line
-        pattern: /^[a-zA-Z]{2,}(([',. -][a-zA-Z ])?[a-zA-Z]*)*$/,
+        pattern: /^(\p{L}|\p{Pd}|\p{Cf}|\p{Pc}|['\s]){2,}$/gu,
         message: 'Invalid name',
     },