From 4e5bb9b4b17e78ac26ab8d4f2e4c0110f15837c0 Mon Sep 17 00:00:00 2001
From: Vito Albano <vito.albano.123@gmail.com>
Date: Fri, 17 Jun 2016 10:55:07 +0100
Subject: [PATCH] Added data automation id for search component

---
 .../alfresco-search-autocomplete.component.html     |  4 ++--
 .../alfresco-search-control.component.html          |  3 ---
 .../src/components/alfresco-search.component.html   | 13 +++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
index d1bbe2bc2e..70f02269e0 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
@@ -1,8 +1,8 @@
 <table *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
     <tbody>
     <tr *ngFor="let result of results; let idx = index">
-        <td><a href="#" (click)="onItemClick(result, $event)">{{result.entry.name}}</a></td>
+        <td><a data-automation-id="autocomplete_res_for_{{result.entry.name}}" href="#" (click)="onItemClick(result, $event)">{{result.entry.name}}</a></td>
     </tr>
     </tbody>
 </table>
-<p *ngIf="errorMessage">{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}</p>
+<p data-automation-id="autocomplete_error_message" *ngIf="errorMessage">{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}</p>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
index 6985269e1e..75d3123702 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
@@ -4,14 +4,11 @@
             <i class="material-icons">search</i>
         </label>
         <div [class]="getTextFieldHolderClassName()">
-<<<<<<< cb5f0a1c272a4d5a76f07ef64efb2612c2129586
             <input class="mdl-textfield__input" [type]="inputType" [autocomplete]="getAutoComplete()"
                    id="searchControl" [ngFormControl]="searchControl" [(ngModel)]="searchTerm" (focus)="onFocus($event)" (blur)="onBlur($event)">
             <label class="mdl-textfield__label" for="searchControl">{{'SEARCH.CONTROL.LABEL' | translate}}</label>
-=======
             <input class="mdl-textfield__input" [type]="inputType" [autocomplete]="getAutoComplete()" id="searchTerm" data-automation-id="search_input" [ngFormControl]="searchControl" [(ngModel)]="searchTerm">
             <label class="mdl-textfield__label" for="searchTerm">{{'SEARCH.CONTROL.LABEL' | translate}}</label>
->>>>>>> #177 added data automation id for search
         </div>
     </div>
 </form>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
index 01ed7bb0c3..2e8d3652d2 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
@@ -1,6 +1,6 @@
 <p data-automation-id="search_result_found" *ngIf="results && results.length">{{ 'SEARCH.RESULTS.SUMMARY' | translate:{numResults: results.length, searchTerm: searchTerm} }}</p>
 <p data-automation-id="search_result_found" *ngIf="results&& results.length == 0">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</p>
-<table *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
+<table data-automation-id="search_result_table" *ngIf="results && results.length && searchTerm" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">
     <thead>
     <tr>
         <th>
@@ -19,12 +19,13 @@
     </thead>
     <tbody>
 
-    <tr *ngFor="let result of results; let idx = index">
+    <tr *ngFor="let result of results; let idx = index">PIPPO
         <td><img src="{{getDocumentThumbnailUrl(result)}}" /></td>
-        <td>{{result.entry.name}}</td>
-        <td>{{result.entry.modifiedByUser.displayName}}</td>
+        <td data-automation-id="file_{{result.entry.name}}">{{result.entry.name}}</td>
+        <td data-automation-id="file_{{result.entry.name}}_{{result.entry.modifiedByUser.displayName}}">{{result.entry.modifiedByUser.displayName}}</td>
         <td>{{result.entry.modifiedAt}}</td>
-    </tr>
+    </tr>SUCA
+
     </tbody>
 </table>
-<p *ngIf="errorMessage">{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}</p>
+<p data-automation-id="search_error_message" *ngIf="errorMessage">{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}</p>