Merge branch 'release/2.13.1'

Author: vmalloc

CHANGES.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 2.13.1
+
+* Searching for starred tests is now supported in test search as well
+* Tests can now be search based on them *not* containing a string in their error messages, via the `!~` operator
+* Fixed a UI bug affecting test queries, causing tests to disappear
+* Fixed UI bugs in help display
+
+
 ## Version 2.13.0
 
 * Backslash can now be configured to replicate test data to an external ElasticSearch service

flask_app/search/logic.py

@@ -4,15 +4,15 @@
 
 from flask import current_app
 from sqlalchemy import func
-
+from flask_security import current_user
 from psycopg2.extras import DateTimeTZRange
 
 from . import value_parsers
 from ..filters import builders as filter_builders
 from ..models import (Entity, Label, Product, ProductRevision, ProductVersion, Session,
                       SessionMetadata, Subject, SubjectInstance, Test, Error,
                       TestInformation, User, db, session_entity, session_label,
-                      session_subject)
+                      session_subject, UserStarredTests)
 from .exceptions import UnknownField
 from .helpers import only_ops
 
@@ -123,11 +123,13 @@ def get_base_query(self):
         return (Test.query
                 .join(Session)
                 .join(TestInformation)
-                .outerjoin(Error, Error.test_id == Test.id)
                 .join(User, User.id == Session.user_id))
 
     def get_fallback_filter(self, term):
-        return TestInformation.name.contains(term) | Error.message.contains(term)
+        query = TestInformation.name.contains(term)
+        if term == "starred" and current_user and current_user.is_authenticated:
+            query = query | db.session.query(UserStarredTests).filter(UserStarredTests.user_id == current_user.id, UserStarredTests.test_id == Test.id).exists().correlate(Test)
+        return query
 
     @only_ops(['=', '!='])
     def search__subject(self, op, value): # pylint: disable=unused-argument
@@ -169,9 +171,9 @@ def search__label(self, op, value):
         subquery = db.session.query(session_label).filter(session_label.c.session_id == Test.session_id, session_label.c.label_id == labels[0].id).exists().correlate(Test)
         return _negate_maybe(op, subquery)
 
-    @only_ops(['~'])
+    @only_ops(['~', '!~'])
     def search__error_message(self, op, value):
-        return Error.message.contains(value)
+        return _negate_maybe(op, Error.query.filter(Error.test_id == Test.id, Error.message.contains(value)).exists().correlate(Test))
 
 
 

flask_app/search/syntax.py

@@ -16,6 +16,7 @@
 
 _OPERATORS = {
     '~': lambda field, term: field.contains(term),
+    '!~': lambda field, term:  ~field.contains(term),
     '=': operator.eq,
     '!=': operator.ne,
     '<': operator.lt,

webapp/app/components/keyboard-shortcuts/component.js

@@ -109,7 +109,7 @@ export default Component.extend(KeyboardShortcuts, {
     element.typeahead("destroy");
     element.off();
     this.set("quick_search_open", false);
-    this.set("help_displayed", false);
+    this.get("display").set("show_help", false);
   },
 
   _do_if_in(paths, callback) {
@@ -166,7 +166,7 @@ export default Component.extend(KeyboardShortcuts, {
     },
 
     close_boxes_or_home() {
-      if (this.get("quick_search_open") || this.get("help_displayed")) {
+      if (this.get("quick_search_open") ||  this.get("display.show_help")) {
         this._close_boxes();
       } else {
         this._do_if_in(["sessions", "session.index"], function(controller) {
@@ -177,7 +177,7 @@ export default Component.extend(KeyboardShortcuts, {
     },
 
     display_help() {
-      this.set("help_displayed", true);
+      this.get("display").set('show_help', true);
     },
 
     goto_sessions() {

webapp/app/components/search-help/component.js

@@ -1,5 +1,12 @@
 import Component from '@ember/component';
+import { inject as service } from '@ember/service';
 
 export default Component.extend({
-  classNames: ["input-group"]
+  classNames: ["input-group"],
+  display: service(),
+   actions: {
+     toggleModal: function() {
+       this.get("display").toggleProperty('show_help');
+     }
+   }
 });

webapp/app/components/search-help/template.hbs

@@ -1,9 +1,9 @@
-<i class="fa fa-question-circle fa-2x faint clickable" {{action (toggle "show" this)}}></i>
+<i class="fa fa-question-circle fa-2x faint clickable" {{action "toggleModal"}}></i>
 
-{{#if show}}
+{{#if display.show_help}}
 
   {{#modal-dialog
-     close=(toggle "show" this)
+     onClose="toggleModal"
      targetAttachment="center"
      translucentOverlay=true}}
     <div class="container">

webapp/app/components/star-marker/component.js

@@ -1,10 +1,14 @@
 import Component from '@ember/component';
 
 export default Component.extend({
-  is_starred: false,
+  starred_object: null,
   actions: {
     toggle: function() {
-      this.sendAction('toggle');
+      let object = this.get('starred_object');
+      return object.toggle_starred()
+        .then(function() {
+            return object.reload();
+        });
     },
   },
 });

webapp/app/components/star-marker/component.scss

@@ -1,5 +1,6 @@
 & {
-    .starred {
-        color: $backslash-orange;
-    }
+  display: inline-block;
+  .starred {
+      color: $backslash-orange;
+  }
 }

webapp/app/components/star-marker/template.hbs

@@ -1,5 +1,7 @@
-{{#if is_starred}}
-  <i class="fa fa-star add-margin-right starred" {{action "toggle"}}></i>
+{{#elements/tool-tip title=(if starred_object.is_starred "unstar test" "star test")}}
+{{#if starred_object.is_starred}}
+    <i class="fa fa-star add-margin-right starred clickable" {{action "toggle"}}></i>
 {{else}}
-  <i class="fa fa-star-o fainter add-margin-right starred" {{action "toggle"}}></i>
+    <i class="fa fa-star-o fainter add-margin-right starred clickable" {{action "toggle"}}></i>
 {{/if}}
+{{/elements/tool-tip}}

webapp/app/components/test-item/component.js

@@ -4,7 +4,6 @@ import Component from '@ember/component';
 
 export default Component.extend({
   display: service(),
-  api: service(),
   attributeBindings: ["href"],
   tagName: "a",
   classNames: ["item", "test", "clickable"],
@@ -27,14 +26,4 @@ export default Component.extend({
     }
     return returned;
   }.property("test"),
-  actions: {
-    toggle_starred: function() {
-      let self = this;
-      return this.get("api")
-        .call("toggle_starred", { object_id: this.get("test.id") })
-        .then(function() {
-            return self.get('test').reload();
-        });
-    },
-  }
 });

webapp/app/components/test-item/template.hbs

@@ -22,7 +22,7 @@
 </div>
 
 <div class="main-info">
-  {{star-marker is_starred=test.is_starred toggle=(action "toggle_starred")}}
+  {{star-marker starred_object=test}}
   {{status-icon status=test.computed_status session_model=session_model}}
   {{#if show_user}}
       {{#elements/tool-tip title=test.user_display_name}}

webapp/app/display/service.js

@@ -5,6 +5,7 @@ const _DEFAULTS = {
   humanize_times: true,
   comments_expanded: false,
   show_side_labels: false,
+  show_help: false,
   session_side_bar_collapsed: false
 };
 

webapp/app/models/test.js

@@ -1,8 +1,10 @@
 import DS from "ember-data";
 import HasLogicalId from "../mixins/has-logical-id";
 import HasComputedStatus from "../mixins/has-computed-status";
+import { inject as service } from '@ember/service';
 
 export default DS.Model.extend(HasLogicalId, HasComputedStatus, {
+  api: service(),
   session_display_id: DS.attr(),
 
   has_any_error: function() {
@@ -61,5 +63,10 @@ export default DS.Model.extend(HasLogicalId, HasComputedStatus, {
     return this.get("status") === "RUNNING";
   }.property("status"),
 
-  is_session_abandoned: DS.attr("boolean")
+  is_session_abandoned: DS.attr("boolean"),
+
+  toggle_starred: function() {
+    return this.get("api")
+      .call("toggle_starred", { object_id: this.get("id") });
+  },
 });

webapp/app/session/index/route.js

@@ -71,6 +71,7 @@ export default Route.extend(
 
     setupController: function(controller, model) {
       this._super(controller, model);
+      controller.set("error", null);
       let parent_controller = this.controllerFor("session");
       parent_controller.set("test_filters", model.filters);
       controller.setProperties(model);

webapp/app/session/index/template.hbs

@@ -23,6 +23,10 @@
               <td><code>error_message ~ msg</code></td>
               <td>Find tests which failed with error message containing <code>msg</code></td>
             </tr>
+            <tr>
+              <td><code>starred</code></td>
+              <td>Find tests which the current user marked as starred</td>
+            </tr>
           </tbody>
         </table>
     {{/search-bar}}

webapp/app/session/test/controller.js

@@ -5,7 +5,6 @@ import Controller from '@ember/controller';
 export default Controller.extend({
 
   runtime_config: service(),
-
   metadata_links: function() {
     let returned = [];
     let metadata = this.get('test_metadata');

webapp/app/session/test/template.hbs

@@ -1,10 +1,10 @@
 <div class="container-fluid">
   <h3>
-    {{status-icon status=test_model.computed_status session_model=session_model spaced=false}} {{elements/copyable-text
-							     copy_value=(format-test-name test_model.info)
-							     value=(format-test-name test_model.info with_filename=false)}}
+    {{star-marker starred_object=test_model}}
+    {{status-icon status=test_model.computed_status session_model=session_model spaced=false}}
+    {{elements/copyable-text copy_value=(format-test-name test_model.info) value=(format-test-name test_model.info with_filename=false)}}
   </h3>
- 
+
   <small>from <strong>{{elements/copyable-text value=test_model.info.file_name}}</strong></small>
 
   {{#if (eq test_model.status "SKIPPED")}}