diff options
author | Young Gyu Park <younggyu@google.com> | 2018-06-14 15:25:45 +0900 |
---|---|---|
committer | Young Gyu Park <younggyu@google.com> | 2018-06-14 15:25:45 +0900 |
commit | cfb2aada4d22dba3d5b97d4caa2791375360ead5 (patch) | |
tree | 2a755fac9098fc0861f4e317e4c14a23090f0995 /src/main/webapp | |
parent | 3ff7fcf07115812ffe5ec50525e23eda3577ac75 (diff) | |
download | dashboard-cfb2aada4d22dba3d5b97d4caa2791375360ead5.tar.gz |
Adding device name filter on test suite page
Test: go/vts-web-staging
Bug: 109877552
Change-Id: I29b81ce059e3a3e311d044728efb9ff6f900ea09
Diffstat (limited to 'src/main/webapp')
-rw-r--r-- | src/main/webapp/WEB-INF/datastore-indexes.xml | 5 | ||||
-rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_suite_release.jsp | 19 |
2 files changed, 21 insertions, 3 deletions
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 @@ -123,6 +123,11 @@ </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"/> <property name="__key__" direction="desc"/> 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> |