Merge branch 'release/2.13.3'

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 2.13.3
+
+* Fixed display issues with child sessions
+* Fixed quick search bar width
+
 ## Version 2.13.2
 
 * Fixed `!~` search being broken

deps/app.txt

@@ -13,7 +13,7 @@ Flask-Migrate>=1.3.0
 Flask-SQLAlchemy>=2.2
 sqlalchemy>=1.1.0
 munch
-pendulum
+pendulum>=2.0.1
 pyparsing
 raven[flask]
 URLObject

flask_app/blueprints/api/quick_search.py

@@ -16,7 +16,7 @@ def quick_search(term: str):
              ((select name as key, name, 'subject' as type from subject) UNION
 
               (select email as key, CASE WHEN first_name is NULL THEN email
-                          ELSE (first_name || ' ' || last_name || ' (' || email || ')') END as name, 'user' as type from "user")) u
+                          ELSE (first_name || ' ' || last_name || ' (' || email || ')') END as name, 'user' as type from "user" where exists(select * from session where user_id = "user".id))) u
         where u.name ilike :term
         ORDER BY name asc
         limit :num_hits

tests/test_quick_search.py

@@ -12,6 +12,7 @@ def test_quick_search_subject(client, subjects, use_spaces):
 
 @pytest.mark.parametrize('use_spaces', [True, False])
 def test_quick_search_user(client, testuser_email, use_spaces):
+    client.report_session_start() # quick search only searches users with existing sessions
     term = testuser_email.split('@')[0][-3:]
     if use_spaces:
         term = ' {} '.format(term)

tests/test_timespan.py

@@ -14,7 +14,7 @@ def test_timespan(session_or_test, get_real_object):
     assert span_start is not None
     assert timespan.upper is None
 
-    assert abs(timespan.lower - pendulum.fromtimestamp(obj.start_time).astimezone()) < _MIN_THRESHOLD
+    assert abs(timespan.lower - pendulum.from_timestamp(obj.start_time).astimezone()) < _MIN_THRESHOLD
 
     duration = 10
 

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

@@ -147,9 +147,9 @@ export default Component.extend(KeyboardShortcuts, {
 
     self.get("store").queryRecord("test", filters).then(function(test) {
       if (test) {
-        self.router.transitionTo(
+        return self.router.transitionTo(
           current_path,
-          session.get("display_id"),
+          test.get("session_display_id"),
           test.get("display_id")
         );
       }

webapp/app/components/keyboard-shortcuts/template.hbs

@@ -5,7 +5,7 @@
      targetAttachment="center"
      translucentOverlay=true}}
     <div class="input-group">
-      <input type="text" class="form-control" id="goto-input" placeholder="Quick jump to...">
+      <input type="text" class="form-control quick-search-input" id="goto-input" placeholder="Quick jump to..." style="min-width: 50em">
     </div>
   {{/modal-dialog}}
 {{/if}}

webapp/app/session/index/route.js

@@ -81,12 +81,13 @@ export default Route.extend(
         // isExiting would be false if only the route's model was changing
         controller.set("search", "");
         controller.set("entered_search", "");
-        let query_params = this.get("queryParams");
-        for (let key in query_params) {
-          if (key.startsWith("show_")) {
-            controller.set(key, true);
-          }
-        }
+        controller.setProperties({
+          show_successful: true,
+          show_unsuccessful: true,
+          show_abandoned: true,
+          show_skipped: true,
+          show_planned: false,
+        });
       }
     },
   }

webapp/app/styles/app.scss

@@ -62,5 +62,4 @@ body {
 @import "ember-modal-dialog/ember-modal-appearance";
 
 @import 'components/users/user-avatar.scss';
-@import 'components/quick-jump.scss';
 @import 'typeahead.scss';