[Findit] Using master flake analysis key for updating triage results

appengine/findit/templates/flake/result.html

Index: appengine/findit/templates/flake/result.html
diff --git a/appengine/findit/templates/flake/result.html b/appengine/findit/templates/flake/result.html
index 893fa51fad9fc1c7783237b2c7efa212ba0c9cd0..ba0856a31c03d1c70ebb19022f5d73abcb668b94 100644
--- a/appengine/findit/templates/flake/result.html
+++ b/appengine/findit/templates/flake/result.html
@@ -55,6 +55,29 @@
     findit.regressedBuildNumber = {{ suspected_flake.build_number or -1 }};
     findit.passRates = {{ pass_rates | tojson | safe }};
 
+    function getTriageParameters(triageResult) {
+      parameters = {}
+      parameters['key'] = "{{ key }}";
+      parameters['suspected_build_number'] = {{ suspected_flake.build_number }};

[chanli, 2016/12/07 22:22:52]

Same question as above.

[lijeffrey, 2016/12/08 01:23:46]

Good catch, done.

+      parameters['triage_result'] = triageResult;
+      return parameters
+    }
+
+    function createTriageUrl(parameters) {
+      var params = [];
+      for(var key in parameters) {
+        if (parameters[key] != undefined) {
+          params.push(key + '=' + parameters[key])
+        }
+      }
+
+      if (params.length == 0) {
+        return '/waterfall/triage-flake-analysis'
+      } else {
+        return '/waterfall/triage-flake-analysis?' + params.join('&');
+      }
+    };
+
     function DrawFlakeTrend() {
       if (findit.passRates.length == 0) {
         $('#flake-data').html('No data available yet.');
@@ -184,7 +207,7 @@
     }
 
     function triageSuspectedFlake(e) {
-      $.getJSON('/waterfall/triage-flake-analysis?flake_info=' + e.name + '&triage_result=' + e.value, function(data) {
+      $.getJSON(createTriageUrl(getTriageParameters(e.value)), function(data) {
         if (! data['success']) {
           alert('Failed to update datastore. Please refresh and try again.');
         } else {
@@ -252,17 +275,16 @@
         <tr>
           <td class="triage-cell"><a href="https://build.chromium.org/p/{{ master_name }}/builders/{{ builder_name }}/builds/{{ suspected_flake.build_number }}" target="_blank">{{ suspected_flake.build_number }}</a></a></td>
           <td class="triage-cell">
-            {% set flake_info = master_name + '/' + builder_name + '/' + build_number | string + '/' + step_name + '/' + test_name + '/' + version_number | string + '/' + suspected_flake.build_number | string %}
-              {% if suspected_flake.triage_result == 1 %}
-                <input type="radio" name="{{ flake_info }}" value="2" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
-                <input type="radio" name="{{ flake_info }}" value="1" checked="checked"onchange= "triageSuspectedFlake(this)">Incorrect
-              {% elif suspected_flake.triage_result == 2 %}
-                <input type="radio" name="{{ flake_info }}" value="2" checked="checked" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
-                <input type="radio" name="{{ flake_info }}" value="1" onchange= "triageSuspectedFlake(this)">Incorrect
-              {% else %}
-                <input type="radio" name="{{ flake_info }}" value="2" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
-                <input type="radio" name="{{ flake_info }}" value="1" onchange= "triageSuspectedFlake(this)">Incorrect
-              {% endif %}
+            {% if suspected_flake.triage_result == 1 %}
+              <input type="radio" name="triage-radio-button" value="2" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
+              <input type="radio" name="triage-radio-button" value="1" checked="checked" onchange= "triageSuspectedFlake(this)">Incorrect
+            {% elif suspected_flake.triage_result == 2 %}
+              <input type="radio" name="triage-radio-button" value="2" checked="checked" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
+              <input type="radio" name="triage-radio-button" value="1" onchange="triageSuspectedFlake(this)">Incorrect
+            {% else %}
+              <input type="radio" name="triage-radio-button" value="2" onchange="triageSuspectedFlake(this)">Correct &nbsp;&nbsp;
+              <input type="radio" name="triage-radio-button" value="1" onchange="triageSuspectedFlake(this)">Incorrect
+            {% endif %}
           </td>
         </tr>
       </table>