gm/rebaseline_server/static/view.html - Issue 28903008: rebaseline_server: add tabs, and ability to submit new baselines to the server

Unified Diff: gm/rebaseline_server/static/view.html

Issue 28903008: rebaseline_server: add tabs, and ability to submit new baselines to the server (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: misc Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: gm/rebaseline_server/static/view.html

===================================================================

--- gm/rebaseline_server/static/view.html (revision 11911)

+++ gm/rebaseline_server/static/view.html (working copy)

@@ -6,6 +6,7 @@

+ <link rel="stylesheet" href="view.css">

</head>

<body>

@@ -13,16 +14,69 @@

</em>

- <div ng-hide="!categories">

+ <div ng-hide="!categories">

<div ng-hide="!(header.isEditable && header.isExported)"

style="background-color:#ffbb00">

WARNING! These results are editable and exported, so any user

who can connect to this server over the network can modify them.

</div>

+ <div style="background-color:#bbffbb">

+ <p>

+ TODO(epoger):

+ <input type="checkbox" name="showTodosCheckbox" value="true"

+ ng-checked="showTodos == true"

+ ng-click="showTodos = !showTodos">

+ show

+ <ul ng-hide="!showTodos">

+ <li>

+ If server was run with --reload flag, automatically check for

+ new results and tell the user when new results are available

+ (the user can reload the page if he wants to see them).

+ </li><li>

+ Add ability to filter builder and test names

+ (using a free-form text field, with partial string match)

+ </li><li>

+ Add more columns, such as pixel diffs, notes/bugs,

+ ignoreFailure boolean

+ </li><li>

+ Improve the column sorting, as per

+ <a href="http://jsfiddle.net/vojtajina/js64b/14/">

+ http://jsfiddle.net/vojtajina/js64b/14/

+ </a>

+ </li><li>

+ Right now, if you change which column is used to

+ sort the data, the column widths may fluctuate based on the

+ longest string <i>currently visible</i> within the top {{displayLimit}}

+ results. Can we fix the column widths to be wide enough to hold

+ any result, even the currently hidden results?

+ </li>

+ </ul>

+ </div>

Results current as of {{localTimeString(header.timeUpdated)}}

</div>

- <table border="1">

+ <div style="font-size:20px">

+ <div ng-repeat="tab in tabs"

+ style="display:inline-block">

+ <div class="tab-{{tab == viewingTab}}"

+ style="display:inline-block"

+ ng-click="setViewingTab(tab)">

+  {{tab}} ({{numResultsPerTab[tab]}}) 

epoger 2013/10/22 21:17:45 I figured the typical rebaselining workflow would

I figured the typical rebaselining workflow would go like this: 1. launch server 2. launch client (open URL in browser), viewing Unfiled tab 3. iterate over the list of failed and/or failure-ignored tests, shunting individual test results to Hidden or Pending Approval depending on whether they pertain to my code change 4. if the list of failed tests is long, I will probably use the filters to make step 3 easier 5. when I think I've got them all, go to the Pending Approval tab 6. take one last look at the results in the Pending Approval tab, and assuming I'm comfortable with all of them (maybe calling over another developer to look), submit them If this is a typical workflow, than my guess is that we don't want a filtered view on the Pending Approval tab (because I want to be absolutely clear on the set of rebaselines I am committing, and know that there aren't any hidden from view) Also, one of the reasons that filtering is NECESSARY in the Unfiled tab is that there are often so many entries there. I think that won't typically be the case for the Pending Approval tab. So those are my thoughts on the matter... but I think you know better than I do what a typical workflow will be. So I would be happy to change the behavior as you see fit. Please tell me how you'd like it to be, or we can look at it together tomorrow if you like (I'll be in the office).

Great idea! Done.

How about this compromise, at least for now: the tabs now show the number of results available at each tab. (So you can see at a glance where the results are)

+ </div>

+ <div style="display:inline-block">

+ </div>

+ </div>

+ <div class="tab-true">

+ <br>

+ <table ng-hide="viewingTab != defaultTab" border="1">

<tr>

Filters

@@ -80,49 +134,52 @@

</tr>

</table>

- <p>

- TODO(epoger):

- <input type="checkbox" name="showTodosCheckbox" value="true"

- ng-checked="showTodos == true"

- ng-click="showTodos = !showTodos">

- show

- <ul ng-hide="!showTodos">

- <li>

- Implement editing of results (we have added the --editable

- flag to the server, but it's not fully implemented yet).

- <div ng-hide="!header.isEditable">

- Currently selected items are: {{selectedItems}}

+ <p>

+ <div ng-hide="'Pending Approval' != viewingTab">

+ <div style="display:inline-block">

+ <button style="font-size:20px"

+ ng-click="submitApprovals(filteredTestData)"

+ ng-disabled="submitPending || (filteredTestData.length == 0)">

+ Update these {{filteredTestData.length}} expectations on the server

+ </button>

+ </div>

+ <div style="display:inline-block">

+ <div style="font-size:20px"

+ ng-hide="!submitPending">

+ Submitting, please wait...

</div>

- </li><li>

- If server was run with --reload flag, automatically check for

- new results and tell the user when new results are available

- (the user can reload the page if he wants to see them).

- </li><li>

- Add ability to filter builder and test names

- (using a free-form text field, with partial string match)

- </li><li>

- Add more columns, such as pixel diffs, notes/bugs,

- ignoreFailure boolean

- </li><li>

- Improve the column sorting, as per

- <a href="http://jsfiddle.net/vojtajina/js64b/14/">

- http://jsfiddle.net/vojtajina/js64b/14/

- </a>

- </li><li>

- Right now, if you change which column is used to

- sort the data, the column widths may fluctuate based on the

- longest string <i>currently visible</i> within the top {{displayLimit}}

- results. Can we fix the column widths to be wide enough to hold

- any result, even the currently hidden results?

- </li>

- </ul>

+ </div>

<p>

- Found {{filteredTestData.length}} matches, and displaying the first

- {{displayLimit}}: <br>

- <!-- TODO(epoger): If (displayLimit <= filteredTestData.length),

- modify this message to indicate that all results are shown. -->

- (click on the column header radio buttons to re-sort by that column)

+ <div>

+ <div style="float:left">

+ Found {{filteredTestData.length}} matches;

+ <span ng-hide="filteredTestData.length <= limitedTestData.length">

+ displaying the first {{limitedTestData.length}}

+ </span>

+ <span ng-hide="filteredTestData.length > limitedTestData.length">

+ displaying them all

+ </span>

+ <br>

+ (click on the column header radio buttons to re-sort by that column)

+ </div>

+ <div style="float:right">

+ <div ng-repeat="otherTab in tabs">

+ <button ng-click="moveSelectedItemsToTab(otherTab)"

+ ng-disabled="selectedItems.length == 0"

+ ng-hide="otherTab == viewingTab">

+ {{selectedItems.length}} move selected tests to {{otherTab}} tab

+ </button>

+ </div>

+ <div style="clear:both">

+ </div>

<br>

<tr>

@@ -149,7 +206,7 @@

ng-click="sortResultsBy('actualHashDigest')">

actual image

</th>

- <th ng-hide="!header.isEditable">

+ <th>

</th>

</tr>

@@ -168,7 +225,7 @@

</a>

</td>

- <td ng-hide="!header.isEditable">

+ <td>

<input type="checkbox"

name="rowSelect"

value="{{result.index}}"

@@ -176,7 +233,8 @@

ng-click="toggleItemSelected(result.index)">

</tr>

</table>

- </div>

+ </div>

+ </div>

<!-- TODO(epoger): Can we get the base URLs (commondatastorage and

issues list) from

« gm/rebaseline_server/server.py ('K') | « gm/rebaseline_server/static/view.css ('k') | no next file » | no next file with comments »