From cfb2aada4d22dba3d5b97d4caa2791375360ead5 Mon Sep 17 00:00:00 2001
From: Young Gyu Park <younggyu@google.com>
Date: Thu, 14 Jun 2018 15:25:45 +0900
Subject: Adding device name filter on test suite page

Test: go/vts-web-staging
Bug: 109877552
Change-Id: I29b81ce059e3a3e311d044728efb9ff6f900ea09
---
 .../android/vts/servlet/ShowPlanReleaseServlet.java   |  5 +++++
 src/main/webapp/WEB-INF/datastore-indexes.xml         |  5 +++++
 src/main/webapp/WEB-INF/jsp/show_suite_release.jsp    | 19 ++++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
index 207857c..96012aa 100644
--- a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
+++ b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
@@ -325,6 +325,11 @@ public class ShowPlanReleaseServlet extends BaseServlet {
             testSuiteResultEntityQuery =
                     testSuiteResultEntityQuery.filter("buildId", request.getParameter("buildId"));
         }
+        if (Objects.nonNull(request.getParameter("deviceName"))) {
+            request.setAttribute("deviceName", request.getParameter("deviceName"));
+            testSuiteResultEntityQuery =
+                testSuiteResultEntityQuery.filter("deviceName", request.getParameter("deviceName"));
+        }
         testSuiteResultEntityQuery = testSuiteResultEntityQuery.orderKey(true);
 
         Pagination<TestSuiteResultEntity> testSuiteResultEntityPagination =
diff --git a/src/main/webapp/WEB-INF/datastore-indexes.xml b/src/main/webapp/WEB-INF/datastore-indexes.xml
index 455ae40..e4f4a10 100644
--- a/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -122,6 +122,11 @@
     <property name="__key__" direction="desc"/>
   </datastore-index>
 
+  <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
+    <property name="deviceName" direction="asc"/>
+    <property name="__key__" direction="desc"/>
+  </datastore-index>
+
   <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
     <property name="testType" direction="asc"/>
     <property name="suitePlan" direction="asc"/>
diff --git a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
index a19aea5..69b6c20 100644
--- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
+++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
@@ -54,7 +54,7 @@
               });
           });
 
-          <c:if test="${not empty branch or not empty hostName or not empty buildId}">
+          <c:if test="${not empty branch or not empty hostName or not empty buildId or not empty deviceName}">
           $(".search-wrapper").slideToggle("fast");
           </c:if>
 
@@ -82,6 +82,12 @@
               } else {
                   delete params['buildId'];
               }
+              var deviceName = $("#deviceName").val().trim();
+              if ( deviceName.length > 0 ) {
+                params['deviceName'] = deviceName;
+              } else {
+                delete params['deviceName'];
+              }
 
               $(location).prop('href', url + "?" + decodeURIComponent($.param(params)));
               $(this).prop('href', url);
@@ -127,10 +133,14 @@
                     </div>
                 </div>
                 <div class="col s12">
-                    <div class="run-type-wrapper col s9">
+                    <div class="input-field col s4">
+                        <input id="deviceName" type="text" value="<c:out value="${deviceName}"></c:out>" autocomplete="off" />
+                        <label>Device Name</label>
+                    </div>
+                    <div class="input-field col s4">
 
                     </div>
-                    <div class="run-type-wrapper col s3">
+                    <div class="run-type-wrapper col s4 right-align">
                         <a class="waves-effect waves-light btn" id="searchBtn">
                             <i class="material-icons left">search</i>Apply
                         </a>
@@ -288,6 +298,9 @@
           <c:if test="${not empty buildId}">
               <c:set var="searchQueryString" value="${searchQueryString}&buildId=${buildId}" />
           </c:if>
+          <c:if test="${not empty deviceName}">
+              <c:set var="searchQueryString" value="${searchQueryString}&deviceName=${deviceName}" />
+          </c:if>
         <div class="col s12 center-align">
           <ul class="pagination">
             <c:choose>
-- 
cgit v1.2.3