From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <michael.g.wood@intel.com>
Received: by yocto-www.yoctoproject.org (Postfix, from userid 118)
	id 132C9E00CFE; Thu, 25 Feb 2016 10:27:02 -0800 (PST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	yocto-www.yoctoproject.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID autolearn=ham version=3.3.1
X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
	*      [score: 0.0000]
	* -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
	*  0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily
	*      valid
Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47])
	by yocto-www.yoctoproject.org (Postfix) with ESMTP id 606C3E00CF0
	for <toaster@yoctoproject.org>; Thu, 25 Feb 2016 10:26:59 -0800 (PST)
Received: by mail-wm0-f47.google.com with SMTP id b205so43324686wmb.1
	for <toaster@yoctoproject.org>; Thu, 25 Feb 2016 10:26:59 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=intel-com.20150623.gappssmtp.com; s=20150623;
	h=subject:to:references:from:message-id:date:user-agent:mime-version
	:in-reply-to:content-transfer-encoding;
	bh=o1Oep2km4oGLRPCaCu7/nS29BpB4Lfbr9tOycIM39pM=;
	b=j89Xqzp3WGuSDuRPnorwBZFcGbJ+aJxorVuGzugbCMzw5ImGIPrISDXHXLRNz/pVZ5
	vQsbZWOQJQUBYwlEkn/3CcNAGHKCPWdSzyGbfp8+Cs6dbjejCUB5wmL9ONekxY0GBiNc
	yq2rt0S0hyCKrOk8I2YI3WeYpTefy3jUWbZOn04bC8MVID0+uByIAapIc4t6GUsR0BGw
	hx7+9fmjl2XCqDxsk/e4PiMswiO14NNBKxwUz8nNBkjS9MNzdnk2kxqwUxLsJT3yN1/A
	nqtUezM2XN+hnYXChqbbO6MRRJK0XXICKeEJw/YpbJhoy2hyNbQOOoUJcH5mCcrMB+XU
	vyyA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:subject:to:references:from:message-id:date
	:user-agent:mime-version:in-reply-to:content-transfer-encoding;
	bh=o1Oep2km4oGLRPCaCu7/nS29BpB4Lfbr9tOycIM39pM=;
	b=bvjM1nHiNo/qt/VEgDUihteTgApfMFSAyxUFSUJYlKaL/4+Bb5AsV5fcQAqdb2i6XD
	Py2qJ6wtQGhwPgNVE/CqF3rP/US5vNruBSqhxya7IVU9nKIlzoblB+vICq4o4X1sl3cw
	jan7ZjN307Pfqc+DQm3169QVAPrgkfdk5cmjKdNeuETl1A4XL9HycEVZTSDMy0YZ7i5O
	VoI688JZSlpCqAhDfY2BGzJYE/UiJiLpf0kzvcCc0jQ6KmL+LFu0Ol2G0sjZIa6psldV
	FgEWXOfbPIQDxWdmQ2YYsIsj8cvtlxrRqX5iGQIXhAz+Gg3pjdr3/p46+5AAcqW8jPKJ
	elcQ==
X-Gm-Message-State: AG10YOS7UYkW1UTxFsBYIYIw+D4rW4k46MFSkJOCtNDe8HVA04oSCg4iW8cdSTEAOuwDjkVv
X-Received: by 10.28.103.11 with SMTP id b11mr52572wmc.81.1456424819184;
	Thu, 25 Feb 2016 10:26:59 -0800 (PST)
Received: from [192.168.2.24] ([83.217.123.106])
	by smtp.googlemail.com with ESMTPSA id
	198sm4368758wml.22.2016.02.25.10.26.58 for <toaster@yoctoproject.org>
	(version=TLSv1/SSLv3 cipher=OTHER);
	Thu, 25 Feb 2016 10:26:58 -0800 (PST)
To: "toaster@yoctoproject.org" <toaster@yoctoproject.org>
References: <1456424485-6566-1-git-send-email-michael.g.wood@intel.com>
	<1456424485-6566-11-git-send-email-michael.g.wood@intel.com>
From: Michael Wood <michael.g.wood@intel.com>
Message-ID: <56CF4771.1030402@intel.com>
Date: Thu, 25 Feb 2016 18:26:57 +0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
	Thunderbird/38.5.1
MIME-Version: 1.0
In-Reply-To: <1456424485-6566-11-git-send-email-michael.g.wood@intel.com>
Subject: Re: [PATCH 10/11] toaster: mrb_section template Add build cancel button
X-BeenThere: toaster@yoctoproject.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Web based interface for BitBake <toaster.yoctoproject.org>
List-Unsubscribe: <https://lists.yoctoproject.org/options/toaster>,
	<mailto:toaster-request@yoctoproject.org?subject=unsubscribe>
List-Archive: <http://lists.yoctoproject.org/pipermail/toaster>
List-Post: <mailto:toaster@yoctoproject.org>
List-Help: <mailto:toaster-request@yoctoproject.org?subject=help>
List-Subscribe: <https://lists.yoctoproject.org/listinfo/toaster>,
	<mailto:toaster-request@yoctoproject.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2016 18:27:02 -0000
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit

Typo in this patch is fixed in branch michaelw/sujith/build-cancel

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=michaelw/sujith/build-cancel


-    <i class="icon-question-sign get-help get-help-blue pull-right" 
title="" data-original-title="Builds in this project cannot be cancelled 
from Toaster: they can only be cancalled from the command line"></i>
+    <i class="icon-question-sign get-help get-help-blue pull-right" 
title="" data-original-title="Builds in this project cannot be cancelled 
from Toaster: they can only be cancelled from the command line"></i>


On 25/02/16 18:21, Michael Wood wrote:
> Add the cancel build button to the mrb section template and add the event
> handlers to cancelABuild.
> Also clean up the calls to startABuild to use the updated libtoaster methods
> and to make the code consistent with it's cancelABuild counterpart.
>
> Co-Author: Sujith H <sujith.h@gmail.com>
>
> Signed-off-by: Michael Wood <michael.g.wood@intel.com>
> ---
>   .../toaster/toastergui/templates/mrb_section.html  | 102 ++++++++++++++-------
>   1 file changed, 71 insertions(+), 31 deletions(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
> index 551e341..647f49b 100644
> --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
> +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
> @@ -99,7 +99,7 @@
>                     " title="Builds in this project cannot be started from Toaster: they are started from the command line">
>                     </i>
>                 {% else %}
> -                  <button class="btn
> +                  <button class="run-again-btn btn
>                         {% if build.outcome == build.SUCCEEDED %}
>                             btn-success
>                         {% elif build.outcome == build.FAILED %}
> @@ -108,10 +108,9 @@
>                             btn-info
>                         {%endif%}
>                         pull-right"
> -                      onclick='scheduleBuild({% url 'projectbuilds' build.project.id as bpi %}{{bpi|json}},
> -                        {{build.project.name|json}},
> -                        {% url 'project' build.project.id as purl %}{{purl|json}},
> -                        {{build.target_set.all|get_tasks|json}})'>
> +                      data-request-url="{% url 'xhr_buildrequest' build.project.pk %}"
> +                      data-target='{{build.target_set.all|get_tasks|json}}'>
> +
>   
>                           Rebuild
>                     </button>
> @@ -119,46 +118,87 @@
>               </div>
>       {%endif%}
>       {%if build.outcome == build.IN_PROGRESS %}
> -            <div class="span4 offset1">
> -              <div class="progress" id="build-pc-done-title-{{build.pk}}" style="margin-top:5px;" data-toggle="tooltip" title="{{build.completeper}}% of tasks complete">
> -                  <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="bar"></div>
> -                </div>
> -            </div>
> -            <div class="lead pull-right"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div>
> -    {%endif%}
> -        </div>
> +    <div class="span4" style="display:none" id="cancelling-msg-{{build.buildrequest.pk}}">
> +      <p class="lead">Cancelling the build ...</p>
> +    </div>
> +    <div class="span4 offset1 progress-info">
> +      <div class="progress" id="build-pc-done-title-{{build.pk}}" style="margin-top:5px;" data-toggle="tooltip" title="{{build.completeper}}% of tasks complete">
> +        <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="bar"></div>
> +      </div>
>       </div>
> +    <div class="lead span3 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div>
> +    {# No build cancel for command line builds project #}
> +    {% if build.project.is_default %}
> +    <i class="icon-question-sign get-help get-help-blue pull-right" title="" data-original-title="Builds in this project cannot be cancelled from Toaster: they can only be cancalled from the command line"></i>
> +    {% else %}
> +    <div class="lead pull-right progress-info">
> +      <button class="cancel-build-btn btn btn-info pull-right"
> +          data-buildrequest-id={{build.buildrequest.pk}}
> +          data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" >
> +        Cancel
> +      </button>
> +    </div>
> +    {% endif %}
> +
> +    {%endif%} {# end if in progress #}
> +
> +    {% if build.outcome == build.CANCELLED %}
> +    <div class="span4">
> +      <p class="lead">Build cancelled</p>
> +    </div>
> +    <button class="btn btn-info pull-right run-again-btn"
> +        data-request-url="{% url 'xhr_buildrequest' build.project.pk %}"
> +        data-target='{{build.target_set.all|get_tasks|json}}'>
> +      Run again
> +
> +    </button>
> +    {% endif %}
> +  </div>
> +</div>
>   
>     {% endfor %}
>     </div>
>   
>   <script>
>   
> -function scheduleBuild(url, projectName, projectUrl, buildlist) {
> -  console.log("scheduleBuild");
> -  libtoaster.startABuild(url, null, buildlist.join(" "), function(){
> -    console.log("reloading page");
> -    window.location.reload();
> -  }, null);
> -}
> -
>   $(document).ready(function(){
> +  {%if mrb_type == 'project' %}
> +  var projectBuilds = true;
> +  {% else %}
> +  var projectBuilds = false;
> +  {% endif %}
> +
> +  $(".cancel-build-btn").click(function(e){
> +    e.preventDefault();
>   
> -  $(".cancel-build-btn").click(function (){
>       var url = $(this).data('request-url');
> -    var buildIds = $(this).data('build-id');
> -    var btn = $(this);
> +    var buildReqIds = $(this).data('buildrequest-id');
> +    var banner = $(this).parents(".alert");
> +
> +    banner.find(".progress-info").fadeOut(function(){
> +      $("#cancelling-msg-" + buildReqIds).show();
> +      libtoaster.cancelABuild(url, buildReqIds, function(){
> +        if (projectBuilds == false){
> +          /* the all builds page is not 'self updating' like thei
> +           * project Builds
> +           */
> +          window.location.reload();
> +        }
> +      }, null);
> +    });
> +  });
> +
> +  $(".run-again-btn").click(function(e){
> +    e.preventDefault();
>   
> -    libtoaster.cancelABuild(url, buildIds, function(){
> -      btn.parents(".alert").fadeOut();
> +    var url = $(this).data('request-url');
> +    var target = $(this).data('target');
> +
> +    libtoaster.startABuild(url, target, function(){
> +      window.location.reload();
>       }, null);
>     });
>   
> -  {%if mrb_type == 'project' %}
> -  var projectBuilds = true;
> -  {% else %}
> -  var projectBuilds = false;
> -  {% endif %}
>   
>     var progressTimer;
>