From afc09c1fd4cb0a4c8338d91d36967789cc5d7f20 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 6 Aug 2019 08:04:36 -0700
Subject: [PATCH] SHIBUI-1395 fixed issue with @type for selenium

---
 .../app/schema-form/widget/select/select.component.html   | 8 ++++----
 ui/src/app/schema-form/widget/select/select.component.ts  | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index e923b7c6d..f3f709717 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -1,5 +1,5 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label">
+    <label [attr.for]="cleanId" class="horizontal control-label">
         <span *ngIf="schema.title">
             <translate-i18n [key]="schema.title">{{ schema.title }}</translate-i18n>
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
@@ -15,7 +15,7 @@
         {{ schema.description }}
     </span>
     <select *ngIf="schema.type !== 'array'"
-        [id]="formProperty._canonicalPath"
+        [id]="cleanId"
         [formControl]="control"
         [attr.name]="name"
         class="form-control"
@@ -37,7 +37,7 @@
         </ng-container>
     </select>
     <select *ngIf="schema.type === 'array'"
-        [id]="formProperty._canonicalPath"
+        [id]="cleanId"
         multiple [formControl]="control"
         [attr.name]="name"
         [attr.disabled]="schema.readOnly"
@@ -50,5 +50,5 @@
             <translate-i18n [key]="getError(error)">error</translate-i18n>
         </ng-container>
     </small>
-    <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
+    <input *ngIf="schema.readOnly" [id]="cleanId" [attr.name]="name" type="hidden" [formControl]="control">
 </div>
diff --git a/ui/src/app/schema-form/widget/select/select.component.ts b/ui/src/app/schema-form/widget/select/select.component.ts
index ecd50a75b..0d52b0835 100644
--- a/ui/src/app/schema-form/widget/select/select.component.ts
+++ b/ui/src/app/schema-form/widget/select/select.component.ts
@@ -61,4 +61,8 @@ export class CustomSelectComponent extends SelectWidget implements AfterViewInit
     getError(error: string): string {
         return HARD_CODED_REQUIRED_MSG.test(error) ? 'message.required' : error;
     }
+
+    get cleanId(): string {
+        return this.formProperty._canonicalPath.replace('@', '');
+    }
 }