From 70015bf746b72cd60203f9a8dd96f87b201d526c Mon Sep 17 00:00:00 2001
From: asankov <a.sankov96@gmail.com>
Date: Thu, 23 Apr 2020 01:48:34 +0300
Subject: [PATCH 1/4] Add bulk edit action button to TestExecutions table

in TestRun page
---
 tcms/testruns/templates/testruns/get.html | 116 +++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/tcms/testruns/templates/testruns/get.html b/tcms/testruns/templates/testruns/get.html
index 1e0b4bc992..17add37903 100644
--- a/tcms/testruns/templates/testruns/get.html
+++ b/tcms/testruns/templates/testruns/get.html
@@ -57,7 +57,7 @@ <h2 class="card-pf-title" style="text-align: left">
                 <h2 class="card-pf-title" style="text-align: left">
                     <span class="fa fa-spinner"></span>{% trans 'Status' %}:
                     <input class="bootstrap-switch" id="status_button" type="checkbox"
-                        {% if not object.stop_date %}checked{% endif %} 
+                        {% if not object.stop_date %}checked{% endif %}
                         {% if not perms.testruns.change_testrun %}disabled{% endif %}>
                 </h2>
 
@@ -117,6 +117,117 @@ <h2 class="card-pf-title" style="text-align: left">
                 <h2 class="card-pf-title">
                     {% trans 'Test executions' %}
                 </h2>
+                <div class="container-fluid">
+                    <div class="row toolbar-pf">
+                        <div class="col-sm-12">
+                            <form class="toolbar-pf-actions">
+                                <div class="form-group toolbar-pf-filter">
+                                    <label class="sr-only" for="filter">Name</label>
+                                    <div class="input-group">
+                                        <div class="input-group-btn">
+                                            <button type="button" class="btn btn-default dropdown-toggle" id="input-filter-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Name <span class="caret"></span></button>
+                                            <ul class="dropdown-menu">
+                                                <li class="selected"><a href="#">Name</a></li>
+                                                <li><a href="#">Type</a></li>
+                                                <li><a href="#">Color</a></li>
+                                            </ul>
+                                        </div><!-- /input-group-btn -->
+                                        <input type="text" class="form-control" id="filter" placeholder="Filter By Name...">
+                                    </div><!-- /input-group -->
+                                </div>
+                                <div class="form-group">
+                                    <div class="dropdown btn-group">
+                                        <button type="button" class="btn btn-default dropdown-toggle" id="filter-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Name <span class="caret"></span></button>
+                                        <ul class="dropdown-menu">
+                                            <li class="selected"><a href="#">Name</a></li>
+                                            <li><a href="#">Type</a></li>
+                                            <li><a href="#">Last Modified</a></li>
+                                        </ul>
+                                    </div>
+                                    <button class="btn btn-link" type="button">
+                                        <span class="fa fa-sort-alpha-asc"></span>
+                                    </button>
+                                </div>
+                                <div class="form-group">
+                                    <button type="button" class="btn btn-default">Add case</button>
+                                    <button type="button" class="btn btn-default">Remove case</button>
+                                    <button type="button" class="btn btn-default">Update case text</button>
+                                    <button type="button" class="btn btn-default">Change assignee</button>
+                                    {% comment %} TODO: dropdown or modal - https://www.patternfly.org/v3/pattern-library/widgets/#modal {% endcomment %}
+                                    <button type="button" class="btn btn-default">{% trans "Change status" %}</button>
+                                    <button type="button" class="btn btn-default">{% trans "Add comment" %}</button>
+                                    <button type="button" class="btn btn-default">{% trans "Add hyperlink" %}</button>
+                                </div>
+                                <div class="dropdown btn-group  dropdown-kebab-pf">
+                                    <button class="btn btn-link dropdown-toggle" type="button" id="dropdownKebab" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                        <span class="fa fa-ellipsis-v"></span>
+                                    </button>
+                                    <ul class="dropdown-menu " aria-labelledby="dropdownKebab">
+                                        <li><a href="#">Action</a></li>
+                                        <li><a href="#">Another Action</a></li>
+                                        <li><a href="#">Something Else Here</a></li>
+                                        <li role="separator" class="divider"></li>
+                                        <li><a href="#">Separated Link</a></li>
+                                    </ul>
+                                </div>  
+                                <div class="toolbar-pf-action-right">
+                                    <div class="form-group toolbar-pf-find">
+                                        <button class="btn btn-link btn-find" type="button">
+                                            <span class="fa fa-search"></span>
+                                        </button>
+                                        <div class="find-pf-dropdown-container">
+                                            <input type="text" class="form-control" id="find" placeholder="Find By Keyword...">
+                                            <div class="find-pf-buttons">
+                                                <span class="find-pf-nums">1 of 3</span>
+                                                <button class="btn btn-link" type="button">
+                                                    <span class="fa fa-angle-up"></span>
+                                                </button>
+                                                <button class="btn btn-link" type="button">
+                                                    <span class="fa fa-angle-down"></span>
+                                                </button>
+                                                <button class="btn btn-link btn-find-close" type="button">
+                                                    <span class="pficon pficon-close"></span>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group toolbar-pf-view-selector">
+                                        <button class="btn btn-link "><i class="fa fa-th"></i></button>
+                                        <button class="btn btn-link "><i class="fa fa-th-large"></i></button>
+                                        <button class="btn btn-link "><i class="fa fa-th-list"></i></button>
+                                    </div>
+                                </div>
+                            </form>
+                            <div class="row toolbar-pf-results">
+                                <div class="col-sm-12">
+                                    <h5>40 Results</h5>
+                                    <p>Active filters:</p>
+                                    <ul class="list-inline">
+                                        <li>
+                                            <span class="label label-info">
+                                            Name: nameofthething
+                                            <a href="#"><span class="fa fa-times"></span></a>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <span class="label label-info">
+                                            Name: nameofthething
+                                            <a href="#"><span class="fa fa-times"></span></a>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <span class="label label-info">
+                                            Name: nameofthething
+                                            <a href="#"><span class="fa fa-times"></span></a>
+                                            </span>
+                                        </li>
+                                    </ul>
+                                    <p><a href="#">Clear All Filters</a></p>
+                                </div><!-- /col -->
+                            </div><!-- /row -->
+                        </div><!-- /col -->
+                    </div><!-- /row -->
+                </div><!-- /container -->
                 <div class="card-pf-body">
                     <div id="test-executions-container" class="list-group tree-list-view-pf">
                         <template id="test-execution-row">
@@ -126,6 +237,9 @@ <h2 class="card-pf-title">
                                         <div class="list-view-pf-left">
                                             <span class="fa fa-angle-right"></span>
                                         </div>
+                                        <div class="list-view-pf-checkbox" style="margin-top: 0; margin-bottom: 0">
+                                            <input type="checkbox">
+                                        </div>
                                         <div class="list-view-pf-body">
                                             <div class="list-view-pf-description" style="flex: 1 0 30%;">
                                                 <div class="list-group-item-text">

From a87cbe2d8fd7ff3cdcfd301fbf918e67edabe2f4 Mon Sep 17 00:00:00 2001
From: asankov <a.sankov96@gmail.com>
Date: Wed, 29 Apr 2020 19:08:36 +0300
Subject: [PATCH 2/4] Replace the default filter parameters

with translated version of filters that make sense - Name, Priority,
Category

Also, translate bulk-edit buttons
---
 tcms/testruns/templates/testruns/get.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tcms/testruns/templates/testruns/get.html b/tcms/testruns/templates/testruns/get.html
index 17add37903..60463024f0 100644
--- a/tcms/testruns/templates/testruns/get.html
+++ b/tcms/testruns/templates/testruns/get.html
@@ -127,21 +127,21 @@ <h2 class="card-pf-title">
                                         <div class="input-group-btn">
                                             <button type="button" class="btn btn-default dropdown-toggle" id="input-filter-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Name <span class="caret"></span></button>
                                             <ul class="dropdown-menu">
-                                                <li class="selected"><a href="#">Name</a></li>
-                                                <li><a href="#">Type</a></li>
-                                                <li><a href="#">Color</a></li>
+                                                <li class="selected"><a href="#">{% trans "Name" %}</a></li>
+                                                <li><a href="#">{% trans "Priority" %}</a></li>
+                                                <li><a href="#">{% trans "Category" %}</a></li>
                                             </ul>
                                         </div><!-- /input-group-btn -->
-                                        <input type="text" class="form-control" id="filter" placeholder="Filter By Name...">
+                                        <input type="text" class="form-control" id="filter" placeholder='{% trans "Filter By Name..." %}'>
                                     </div><!-- /input-group -->
                                 </div>
                                 <div class="form-group">
                                     <div class="dropdown btn-group">
                                         <button type="button" class="btn btn-default dropdown-toggle" id="filter-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Name <span class="caret"></span></button>
                                         <ul class="dropdown-menu">
-                                            <li class="selected"><a href="#">Name</a></li>
-                                            <li><a href="#">Type</a></li>
-                                            <li><a href="#">Last Modified</a></li>
+                                            <li class="selected"><a href="#">{% trans "Name" %}</a></li>
+                                            <li><a href="#">{% trans "Priority" %}</a></li>
+                                            <li><a href="#">Last {% trans "Category" %}</a></li>
                                         </ul>
                                     </div>
                                     <button class="btn btn-link" type="button">
@@ -149,10 +149,10 @@ <h2 class="card-pf-title">
                                     </button>
                                 </div>
                                 <div class="form-group">
-                                    <button type="button" class="btn btn-default">Add case</button>
-                                    <button type="button" class="btn btn-default">Remove case</button>
-                                    <button type="button" class="btn btn-default">Update case text</button>
-                                    <button type="button" class="btn btn-default">Change assignee</button>
+                                    <button type="button" class="btn btn-default">{% trans "Add case" %}</button>
+                                    <button type="button" class="btn btn-default">{% trans "Remove case" %}</button>
+                                    <button type="button" class="btn btn-default">{% trans "Update case text" %}</button>
+                                    <button type="button" class="btn btn-default">{% trans "Change assignee" %}</button>
                                     {% comment %} TODO: dropdown or modal - https://www.patternfly.org/v3/pattern-library/widgets/#modal {% endcomment %}
                                     <button type="button" class="btn btn-default">{% trans "Change status" %}</button>
                                     <button type="button" class="btn btn-default">{% trans "Add comment" %}</button>

From 43c10c3667acc8de04f8beaa825228710e80a909 Mon Sep 17 00:00:00 2001
From: asankov <a.sankov96@gmail.com>
Date: Wed, 29 Apr 2020 19:16:33 +0300
Subject: [PATCH 3/4] Remove hard-coded results count

update it via JS

Remove hard-coded filters.
Put up some TODOs for later
---
 tcms/testruns/static/testruns/js/get.js   |  2 ++
 tcms/testruns/templates/testruns/get.html | 25 ++++-------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/tcms/testruns/static/testruns/js/get.js b/tcms/testruns/static/testruns/js/get.js
index fc945d63e3..3cd8e9df73 100644
--- a/tcms/testruns/static/testruns/js/get.js
+++ b/tcms/testruns/static/testruns/js/get.js
@@ -113,6 +113,8 @@ function renderTestExecutions(testExecutions, executionStatuses) {
 }
 
 function renderAdditionalInformation(testExecutions, testExecutionCaseIds) {
+    $('.test-executions-count').html(testExecutions.length);
+
     jsonRPC('TestCase.filter', { 'id__in': testExecutionCaseIds }, testCases => {
         testExecutions.forEach(testExecution => {
             const testCase = testCases.find(testCase => testCase.id === testExecution.case_id)
diff --git a/tcms/testruns/templates/testruns/get.html b/tcms/testruns/templates/testruns/get.html
index 60463024f0..b2190ca3c7 100644
--- a/tcms/testruns/templates/testruns/get.html
+++ b/tcms/testruns/templates/testruns/get.html
@@ -162,6 +162,7 @@ <h2 class="card-pf-title">
                                     <button class="btn btn-link dropdown-toggle" type="button" id="dropdownKebab" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                                         <span class="fa fa-ellipsis-v"></span>
                                     </button>
+                                    {% comment %} TODO: do we need this kebap button here {% endcomment %}
                                     <ul class="dropdown-menu " aria-labelledby="dropdownKebab">
                                         <li><a href="#">Action</a></li>
                                         <li><a href="#">Another Action</a></li>
@@ -200,28 +201,10 @@ <h2 class="card-pf-title">
                             </form>
                             <div class="row toolbar-pf-results">
                                 <div class="col-sm-12">
-                                    <h5>40 Results</h5>
+                                    <h5><span class="test-executions-count"></span> Results</h5>
                                     <p>Active filters:</p>
-                                    <ul class="list-inline">
-                                        <li>
-                                            <span class="label label-info">
-                                            Name: nameofthething
-                                            <a href="#"><span class="fa fa-times"></span></a>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <span class="label label-info">
-                                            Name: nameofthething
-                                            <a href="#"><span class="fa fa-times"></span></a>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <span class="label label-info">
-                                            Name: nameofthething
-                                            <a href="#"><span class="fa fa-times"></span></a>
-                                            </span>
-                                        </li>
-                                    </ul>
+                                    <ul class="list-inline" class="active-filters"></ul>
+                                    {% comment %} TODO: maybe don't show this button until at least one filter is added {% endcomment %}
                                     <p><a href="#">Clear All Filters</a></p>
                                 </div><!-- /col -->
                             </div><!-- /row -->

From e46293d03e48d3751f17ea714ca53287aa6f5b68 Mon Sep 17 00:00:00 2001
From: asankov <a.sankov96@gmail.com>
Date: Sat, 30 May 2020 03:12:26 +0300
Subject: [PATCH 4/4] Reformat get.js

to allign formatting of pasted code with file and project formatting
---
 tcms/testruns/static/testruns/js/get.js | 88 ++++++++++++-------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/tcms/testruns/static/testruns/js/get.js b/tcms/testruns/static/testruns/js/get.js
index 3cd8e9df73..bfc4f31d31 100644
--- a/tcms/testruns/static/testruns/js/get.js
+++ b/tcms/testruns/static/testruns/js/get.js
@@ -156,55 +156,55 @@ function renderTestExecutionRow(template, testExecution, testExecutionStatus) {
 /////// and need updates before they can be used again
 ///////
 function changeExecutionAssignee() {
-  const executions = 0 // todo: this is the list of all selected executions
-  if (!executions.length) {
-    window.alert(default_messages.alert.no_case_selected);
-    return false;
-  }
-//todo: all texts in alert/prompt must come translated from the HTML template
-  var assignee = window.prompt('Please type new email or username for assignee');
-  if (!assignee) {
-    return false;
-  }
-  executions.forEach(execution_id => jsonRPC('TestExecution.update', [execution_id, {'assignee': assignee}], () => { }, sync=true));
-  window.location.reload();
+    const executions = 0 // todo: this is the list of all selected executions
+    if (!executions.length) {
+        window.alert(default_messages.alert.no_case_selected);
+        return false;
+    }
+    //todo: all texts in alert/prompt must come translated from the HTML template
+    var assignee = window.prompt('Please type new email or username for assignee');
+    if (!assignee) {
+        return false;
+    }
+    executions.forEach(execution_id => jsonRPC('TestExecution.update', [execution_id, { 'assignee': assignee }], () => { }, sync = true));
+    window.location.reload();
 }
 
 function updateExecutionText() {
-  const executions = 0 // todo: this is the list of all selected executions
-  if (!executions.length) {
-    window.alert(default_messages.alert.no_case_selected);
-    return false;
-  }
-//todo: translations
-  executions.forEach(executionId =>
-    jsonRPC('TestExecution.update', [executionId, {'case_text_version': 'latest'}], () => { }, sync=true)
-  );
-  window.location.reload(true);
+    const executions = 0 // todo: this is the list of all selected executions
+    if (!executions.length) {
+        window.alert(default_messages.alert.no_case_selected);
+        return false;
+    }
+    //todo: translations
+    executions.forEach(executionId =>
+        jsonRPC('TestExecution.update', [executionId, { 'case_text_version': 'latest' }], () => { }, sync = true)
+    );
+    window.location.reload(true);
 }
 
 function fileBugFromExecution(run_id, title_container, container, case_id, execution_id) {
-  // todo: this dialog needs to be reimplemented with a Patternfly modal
-  var dialog = new AddIssueDialog({
-    'action': 'Report',
-    'onSubmit': function (e, dialog) {
-      e.stopPropagation();
-      e.preventDefault();
-
-        var tracker_id = dialog.get_data()['bug_system_id'];
-        jsonRPC('Bug.report', [execution_id, tracker_id], function(result) {
-            $('#dialog').hide();
-
-            if (result.rc === 0) {
-                // unescape b/c Issue #1533
-                const target_url = result.response.replace(/&amp;/g, '&')
-                window.open(target_url, '_blank');
-            } else {
-                window.alert(result.response);
-            }
-      });
-    }
-  });
+    // todo: this dialog needs to be reimplemented with a Patternfly modal
+    var dialog = new AddIssueDialog({
+        'action': 'Report',
+        'onSubmit': function (e, dialog) {
+            e.stopPropagation();
+            e.preventDefault();
+
+            var tracker_id = dialog.get_data()['bug_system_id'];
+            jsonRPC('Bug.report', [execution_id, tracker_id], function (result) {
+                $('#dialog').hide();
+
+                if (result.rc === 0) {
+                    // unescape b/c Issue #1533
+                    const target_url = result.response.replace(/&amp;/g, '&')
+                    window.open(target_url, '_blank');
+                } else {
+                    window.alert(result.response);
+                }
+            });
+        }
+    });
 
-  dialog.show();
+    dialog.show();
 }