Merge branch 'hotfix/18.1.2'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [18.1.2] - 2018-11-05
+- Engines:
+    - `registries/discover` - reset to first page on user search input
+
 ## [18.1.1] - 2018-11-05
 - Routes:
     - `guid-node/registrations` - fix sorting of registration schema on new registration modal

lib/registries/addon/components/registries-header/template.hbs

@@ -12,12 +12,12 @@
     <div class="row m-t-md m-b-lg text-center">
         <div class="col-xs-12 col-sm-8 col-sm-offset-2">
             <div class="input-group input-group-lg">
-                {{input value=value class="form-control" placeholder=(t 'registries.header.search_placeholder')}}
+                {{input data-test-search-box value=value class="form-control" placeholder=(t 'registries.header.search_placeholder')}}
                 <span class="input-group-btn">
                     {{#if showHelp}}
                         <button class="btn btn-default" type="button" {{action "toggleHelp"}}>{{fa-icon "question" class="text-muted"}}</button>
                     {{/if}}
-                    <button class="btn btn-default" type="button" {{action "onClick"}}>{{t 'registries.header.search'}}</button>
+                    <button data-test-search-button class="btn btn-default" type="button" {{action "onClick"}}>{{t 'registries.header.search'}}</button>
                 </span>
             </div>
             <p class="p-l-md text-left">

lib/registries/addon/discover/controller.ts

@@ -214,6 +214,12 @@ export default class Discover extends Controller.extend(discoverQueryParams.Mixi
             this.set('registrationTypes', A([]));
         }
 
+        // If query has changed but page has not changed reset page to 1.
+        // The page check stops other tests from breaking
+        if (this.searchOptions && this.searchOptions.query !== this.query && this.searchOptions.page === this.page) {
+            this.set('page', 1);
+        }
+
         let options = new SearchOptions({
             query: this.query,
             size: this.size,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "18.1.1",
+  "version": "18.1.2",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <[email protected]>",

tests/engines/registries/integration/discover/discover-test.ts

@@ -1,10 +1,10 @@
 import EngineInstance from '@ember/engine/instance';
-import { click, getRootElement, visit } from '@ember/test-helpers';
+import { click, fillIn, getRootElement, visit } from '@ember/test-helpers';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import Analytics from 'ember-osf-web/services/analytics';
 import { setupEngineApplicationTest } from 'ember-osf-web/tests/helpers/engines';
 import { TestContext } from 'ember-test-helpers';
-import { OrderedSet } from 'immutable';
+import { OrderedSet, ValueObject } from 'immutable';
 import $ from 'jquery';
 import { module, test } from 'qunit';
 import { SearchOptions, SearchOrder, SearchResults } from 'registries/services/search';
@@ -15,6 +15,10 @@ import ShareSearch, {
 } from 'registries/services/share-search';
 import sinon from 'sinon';
 
+const equals = (expected: ValueObject) => {
+    return sinon.match((x: any) => expected.equals(x));
+};
+
 const emptyResults: SearchResults<ShareRegistration> = {
     total: 0,
     results: [],
@@ -525,6 +529,79 @@ module('Registries | Integration | discover', hooks => {
         }));
     });
 
+    test('page resets on typing query', async function(this: TestContext) {
+        const stub = sinon.stub(this.owner.lookup('service:share-search'), 'registrations').returns({
+            total: 0,
+            results: [],
+            aggregations: {
+                sources: {
+                    buckets: [{ key: 'OSF', doc_count: 10 }],
+                },
+            },
+        });
+
+        await visit('/registries/discover?page=10');
+
+        sinon.assert.calledWith(stub, equals(new SearchOptions({
+            query: '',
+            page: 10,
+            order: new SearchOrder({
+                display: 'registries.discover.order.relevance',
+                ascending: false,
+                key: 'date_modified',
+            }),
+        })));
+
+        await fillIn('[data-test-search-box]', 'Test Query');
+
+        sinon.assert.calledWith(stub, equals(new SearchOptions({
+            query: 'Test Query',
+            page: 1,
+            order: new SearchOrder({
+                display: 'registries.discover.order.relevance',
+                ascending: true,
+                key: undefined,
+            }),
+        })));
+    });
+
+    test('page resets on clicking search', async function(this: TestContext) {
+        sinon.stub(this.owner.lookup('service:analytics'), 'click');
+        const stub = sinon.stub(this.owner.lookup('service:share-search'), 'registrations').returns({
+            total: 0,
+            results: [],
+            aggregations: {
+                sources: {
+                    buckets: [{ key: 'OSF', doc_count: 10 }],
+                },
+            },
+        });
+
+        await visit('/registries/discover?page=10&q=Testing');
+
+        sinon.assert.calledWith(stub, equals(new SearchOptions({
+            query: 'Testing',
+            page: 10,
+            order: new SearchOrder({
+                display: 'registries.discover.order.relevance',
+                ascending: true,
+                key: undefined,
+            }),
+        })));
+
+        await click('[data-test-search-button]');
+
+        sinon.assert.calledWith(stub, equals(new SearchOptions({
+            query: 'Testing',
+            page: 1,
+            order: new SearchOrder({
+                display: 'registries.discover.order.relevance',
+                ascending: true,
+                key: undefined,
+            }),
+        })));
+    });
+
     test('scroll top on pagination', async function(this: TestContext, assert: Assert) {
         const results = {
             total: 21,