Add editing of dimensions on retry

appengine/swarming/ui/res/imp/taskpage/task-page.html

 <!--
   Copyright 2016 The LUCI Authors. All rights reserved.
   Use of this source code is governed under the Apache License, Version 2.0
   that can be found in the LICENSE file.
 
   This in an HTML Import-able file that contains the definition
   of the following elements:
 
     <task-page>
 
@@ skipping 23 matching lines @@
 <link rel="import" href="/res/imp/bower_components/polymer/polymer.html">
 
 <link rel="import" href="/res/imp/common/common-behavior.html">
 <link rel="import" href="/res/imp/common/interval-timer.html">
 <link rel="import" href="/res/imp/common/single-page-style.html">
 <link rel="import" href="/res/imp/common/swarming-app.html">
 <link rel="import" href="/res/imp/common/task-behavior.html">
 <link rel="import" href="/res/imp/common/url-param.html">
 
 <link rel="import" href="task-page-data.html">
+<link rel="import" href="task-retry-prompt.html">
 <link rel="import" href="task-disambiguation.html">
 
 <dom-module id="task-page">
   <template>
     <style include="iron-flex iron-flex-alignment swarming-app-style single-page-style task-style">
       .milo {
         width: calc(100% - 11px);
         /** We don't control the milo site and it's on a different domain than
         us, so there's no good way to avoid scrolling other than tell the iframe
         it is really tall.*/
@@ skipping 542 matching lines @@
 
     <paper-dialog id="prompt" modal on-iron-overlay-closed="_promptClosed">
       <h2>Are you sure?</h2>
       <div>Are you sure you want to [[_dialog_prompt]]?</div>
       <div class="buttons">
         <paper-button dialog-dismiss autofocus>No</paper-button>
         <paper-button dialog-confirm>Yes</paper-button>
       </div>
     </paper-dialog>
 
+    <paper-dialog id="retry_task" modal on-iron-overlay-closed="_retryClosed">
+      <task-retry-prompt id="retry_task_prompt"
+        task_id="[[task_id]]"
+        task_dimensions="{{_retry_dimensions}}">
+      </task-retry-prompt>
+      <div class="buttons">
+        <paper-button dialog-dismiss>Cancel</paper-button>
+        <paper-button dialog-confirm>OK</paper-button>
+      </div>
+    </paper-dialog>
+
     <interval-timer period="[[_refresh_interval]]" on-trigger="_softRefresh">
     </interval-timer>
 
   </template>
   <script>
   (function(){
     Polymer({
       is: 'task-page',
 
       behaviors: [
@@ skipping 70 matching lines @@
         _request: {
           type: Object,
           observer: "_requestUpdated"
         },
         _request_detail: {
           type: Boolean,
         },
         _result: {
           type: Object,
         },
+        _retry_dimensions: {
+          type: Array,
+        },
         _server_details: {
           type: Object,
         },
         _stdout: {
           type: String,
         }
       },
 
       observers: [
         "_whyPending(_request,_result,_auth_headers)"],
@@ skipping 176 matching lines @@
         var end = result.started_ts || result.abandoned_ts || new Date();
         // In the case of deduplicated tasks, started_ts comes before the task.
         if (end <= result.created_ts) {
           return "0s";
         }
         return this._timeDiffExact(result.created_ts, end);
       },
 
       _promptClosed: function(e) {
         if (e.detail.confirmed) {
-          if (this._dialog_prompt.startsWith("cancel")) {
-            this._cancelTask();
-          } else {
-            this._retryTask();
-          }
+          this._cancelTask();
         }
       },
 
       _promptCancel: function() {
         this.set("_dialog_prompt", "cancel task "+this.task_id);
         this.$.prompt.open();
       },
 
       _promptRetry: function() {
-        this.set("_dialog_prompt", "retry task "+this.task_id);
-        this.$.prompt.open();
+        this.$.retry_task_prompt.setDimensions(this._request.properties.dimensions);
+        this.$.retry_task.open();
       },
 
-      _rawOutput: function(stdout, result) {
-        if (stdout) {
-          return stdout;
-        }
-        if (result.state === "PENDING" || result.state === "RUNNING") {
-          return "[No output yet]";
-        }
-        return "[No output received]";
-      },
-
-      _refresh: function() {
-        this.$.data.reload();
-      },
-
-      _requestUpdated: function(request) {
-        if (this._noMilo(request)) {
-          this.set("_show_raw", 1);
-        }
-      },
-
-      _softRefresh: function() {
-        if (this._result && this._result.state !== "RUNNING" &&
-            this._result.state !==  "PENDING") {
+      _retryClosed: function(e) {
+        if (!this._request) {
+          sk.errorMessage("Task not yet loaded", 3000);
           return;
         }
-        this.$.data.reload();
-        var miloFrame = this.$$("iframe")
-        if (miloFrame) {
-          miloFrame.src = this._getDisplayServerLink(this._server_details.display_server_url_template,this.task_id);
-        }
-      },
-
-      _retryTask: function() {
-        if (!this._request) {
-          sk.errorMessage("Task not yet loaded", 3000);
+        if (!e.detail.confirmed) {
           return;
         }
         var newTask = {
           expiration_secs: this._request.expiration_secs,
           name: this._request.name +" (retry)",
           parent_task_id: this._request.parent_task_id,
           priority: this._request.priority,
           properties:this._request.properties,
           tags: this._request.tags,
           user: this._profile.email,
           service_account: this._request.service_account,
         }
+        newTask.properties.dimensions = this._retry_dimensions.filter(function(d){
+          return d && d.key && d.value;
+        });
+        if (!newTask.properties.dimensions || !newTask.properties.dimensions.length) {
+          sk.errorMessage("Your retried task must specify dimensions", 5000);
+          return;
+        }
+        console.log("Retrying with dimensions", newTask.properties.dimensions);
         newTask.properties.idempotent = false;
         swarming.postWithToast("/api/swarming/v1/tasks/new", "Retrying task " + this.task_id,
           this._auth_headers, newTask)
         .then(function(response) {
             response = JSON.parse(response);
             if (response && response.task_id) {
               var state = {id: this.task_id};
               history.pushState(state, "Task Page");
               this.set("task_id", response.task_id);
             }
           }.bind(this), function(e) {
             console.log("Task could not be retried", e);
           }
         );
       },
 
+      _rawOutput: function(stdout, result) {
+        if (stdout) {
+          return stdout;
+        }
+        if (result.state === "PENDING" || result.state === "RUNNING") {
+          return "[No output yet]";
+        }
+        return "[No output received]";
+      },
+
+      _refresh: function() {
+        this.$.data.reload();
+      },
+
+      _requestUpdated: function(request) {
+        if (this._noMilo(request)) {
+          this.set("_show_raw", 1);
+        }
+      },
+
+      _softRefresh: function() {
+        if (this._result && this._result.state !== "RUNNING" &&
+            this._result.state !==  "PENDING") {
+          return;
+        }
+        this.$.data.reload();
+        var miloFrame = this.$$("iframe")
+        if (miloFrame) {
+          var templ = this._server_details.display_server_url_template;
+          miloFrame.src = this._getDisplayServerLink(templ, this.task_id);
+        }
+      },
+
       _rowspan: function(dims) {
         dims = dims || [];
         return dims.length + 1;
       },
 
       _supportsMilo: function(request, showRaw) {
         return !showRaw && request && this._tag(request, "allow_milo");
       },
 
       _toggleDetails: function() {
@@ skipping 47 matching lines @@
           this._getJsonAsync("_other_running", "/api/swarming/v1/tasks/count", "_busyRunningCount", this._auth_headers, taskCountParams);
           // change running to pending
           taskCountParams.state = ["PENDING"];
           this._getJsonAsync("_other_pending", "/api/swarming/v1/tasks/count", "_busyPendingCount", this._auth_headers, taskCountParams);
         }
       }
     });
   })();
   </script>
 </dom-module>