From 3ed34d194cb9eaf99f3b356b3ec443a66b0eef50 Mon Sep 17 00:00:00 2001
From: Ivaschenko Christina <caloriees@gmail.com>
Date: Wed, 25 Oct 2017 14:26:50 +0700
Subject: [PATCH 1/2] fix(vm-creation): Error in VM creation when affinity
 group contains commas

---
 src/app/vm/vm-creation/vm-creation.component.html | 3 ++-
 src/i18n/en.json                                  | 2 +-
 src/i18n/ru.json                                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/vm/vm-creation/vm-creation.component.html b/src/app/vm/vm-creation/vm-creation.component.html
index dad23fb504..0f89a0f185 100644
--- a/src/app/vm/vm-creation/vm-creation.component.html
+++ b/src/app/vm/vm-creation/vm-creation.component.html
@@ -153,11 +153,12 @@ <h5>{{ 'VM_PAGE.VM_CREATION.GROUP' | translate }}</h5>
           </div>
 
           <div>
-            <h5>{{ 'VM_PAGE.VM_CREATION.AFFINITY_GROUPS' | translate }}</h5>
+            <h5>{{ 'VM_PAGE.VM_CREATION.AFFINITY_GROUP' | translate }}</h5>
             <mat-form-field floatPlaceholder="never">
               <input
                 name="group"
                 matInput
+                pattern="[a-zA-Z]{1}[a-zA-Z0-9\-\_]{0,61}[a-zA-Z0-9]$"
                 [placeholder]="'VM_PAGE.VM_CREATION.NO_GROUP' | translate"
                 [matAutocomplete]="affinityGroups"
                 [(ngModel)]="formState.state.affinityGroup.name"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8fd7718e0f..def5148352 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -476,7 +476,7 @@
       "DISK_SIZE": "Disk size",
       "GROUP": "Group",
       "NO_GROUP": "No group",
-      "AFFINITY_GROUPS": "Affinity groups",
+      "AFFINITY_GROUP": "Affinity group",
       "SECURITY_GROUPS": "Firewall rules",
       "KEYBOARD_LAYOUT": "Keyboard layout",
       "KB_US": "Standard (US) keyboard",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index d011dd40eb..dfa85d7457 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -477,7 +477,7 @@
       "DISK_SIZE": "Размер диска",
       "GROUP": "Группа",
       "NO_GROUP": "Без группы",
-      "AFFINITY_GROUPS": "Аффинитетные группы",
+      "AFFINITY_GROUP": "Аффинитетная группа",
       "SECURITY_GROUPS": "Брандмауэр",
       "KEYBOARD_LAYOUT": "Раскладка клавиатуры",
       "KB_US": "Standard (US) keyboard",

From 9c51f47a7f30bb930f4236a47f137d0ab8354b80 Mon Sep 17 00:00:00 2001
From: Ivaschenko Christina <caloriees@gmail.com>
Date: Thu, 26 Oct 2017 13:52:36 +0700
Subject: [PATCH 2/2] fix(vm-creation): Error in VM creation when affinity
 group contains commas - fixes after code review

---
 src/app/vm/vm-creation/vm-creation.component.html | 8 ++++++++
 src/app/vm/vm-creation/vm-creation.component.ts   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/app/vm/vm-creation/vm-creation.component.html b/src/app/vm/vm-creation/vm-creation.component.html
index 0f89a0f185..c012786f8b 100644
--- a/src/app/vm/vm-creation/vm-creation.component.html
+++ b/src/app/vm/vm-creation/vm-creation.component.html
@@ -54,11 +54,15 @@ <h5>{{ 'VM_PAGE.VM_CREATION.NAME' | translate }}</h5>
                 (ngModelChange)="displayNameChange($event)"
                 [placeholder]="'VM_PAGE.VM_CREATION.NAME' | translate"
                 pattern="^[a-zA-Z]{1}[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]$"
+                [maxlength]="maxEntityNameLength"
                 required
               >
               <mat-error *ngIf="takenName">
                 {{ 'VM_PAGE.VM_CREATION.THIS_NAME_IS_TAKEN' | translate }}
               </mat-error>
+              <mat-hint align="end">
+                <cs-character-count [value]="formState.state.displayName" [maxLength]="maxEntityNameLength"></cs-character-count>
+              </mat-hint>
             </mat-form-field>
           </div>
 
@@ -161,9 +165,13 @@ <h5>{{ 'VM_PAGE.VM_CREATION.AFFINITY_GROUP' | translate }}</h5>
                 pattern="[a-zA-Z]{1}[a-zA-Z0-9\-\_]{0,61}[a-zA-Z0-9]$"
                 [placeholder]="'VM_PAGE.VM_CREATION.NO_GROUP' | translate"
                 [matAutocomplete]="affinityGroups"
+                [maxlength]="maxEntityNameLength"
                 [(ngModel)]="formState.state.affinityGroup.name"
                 (ngModelChange)="affinityGroupChange($event)"
               >
+              <mat-hint align="end">
+                <cs-character-count [value]="formState.state.affinityGroup.name" [maxLength]="maxEntityNameLength"></cs-character-count>
+              </mat-hint>
             </mat-form-field>
             <mat-autocomplete #affinityGroups>
               <mat-option
diff --git a/src/app/vm/vm-creation/vm-creation.component.ts b/src/app/vm/vm-creation/vm-creation.component.ts
index 8c35840414..ea05f77fd9 100644
--- a/src/app/vm/vm-creation/vm-creation.component.ts
+++ b/src/app/vm/vm-creation/vm-creation.component.ts
@@ -55,6 +55,7 @@ export class VmCreationComponent implements OnInit {
   public progressLoggerController = new ProgressLoggerController();
   public showOverlay = false;
   public deploymentStopped = false;
+  public maxEntityNameLength = 63;
   public loggerStageList: Array<ProgressLoggerMessage>;
 
   public visibleAffinityGroups: Array<AffinityGroup>;