Auto merge of #2475 - Turbo87:search, r=locks

Simplify search field handling code

This PR simplifies the code that handles the values of the two search boxes in the header. It mainly gets rid of a query param `alias()`, an unnecessary `oneWay()` property and two `controllerFor()` lookups. It also removes the `search` service and adds a new `header` service instead.

r? @locks

Author: bors

app/controllers/application.js

@@ -1,14 +1,12 @@
 import Controller from '@ember/controller';
-import { oneWay } from '@ember/object/computed';
 import { on } from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 
 import { EKMixin, keyDown, keyPress } from 'ember-keyboard';
 
 export default Controller.extend(EKMixin, {
+  header: service(),
   flashMessages: service(),
-  search: service(),
-  searchQuery: oneWay('search.q'),
   session: service(),
 
   keyboardActivated: true,
@@ -28,7 +26,7 @@ export default Controller.extend(EKMixin, {
     search() {
       this.transitionToRoute('search', {
         queryParams: {
-          q: this.searchQuery,
+          q: this.header.searchValue,
           page: 1,
         },
       });

app/controllers/search.js

@@ -1,16 +1,14 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
-import { alias, bool, readOnly } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
+import { bool, readOnly } from '@ember/object/computed';
 
 import { task } from 'ember-concurrency';
 
 import PaginationMixin from '../mixins/pagination';
 
 export default Controller.extend(PaginationMixin, {
-  search: service(),
   queryParams: ['all_keywords', 'page', 'per_page', 'q', 'sort'],
-  q: alias('search.q'),
+  q: null,
   page: '1',
   per_page: 10,
 

app/routes/index.js

@@ -17,8 +17,6 @@ export default Route.extend({
   },
 
   setupController(controller) {
-    this.controllerFor('application').set('searchQuery', null);
-
     if (!controller.dataTask.hasData) {
       let promise = controller.dataTask.perform();
       if (this.fastboot.isFastBoot) {

app/routes/search.js

@@ -1,6 +1,9 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default Route.extend({
+  header: service(),
+
   queryParams: {
     all_keywords: { refreshModel: true },
     page: { refreshModel: true },
@@ -15,7 +18,12 @@ export default Route.extend({
   },
 
   setupController(controller, params) {
-    this.controllerFor('application').set('searchQuery', params.q);
+    this.header.set('searchValue', params.q);
     controller.dataTask.perform(params);
   },
+
+  deactivate() {
+    this._super(...arguments);
+    this.header.set('searchValue', null);
+  },
 });

app/services/search.js renamed to app/services/header.js

@@ -1,5 +1,6 @@
 import Service from '@ember/service';
 
 export default class SearchService extends Service {
-  q = null;
+  // the value of the search input fields in the header
+  searchValue = null;
 }

app/templates/application.hbs

@@ -15,8 +15,8 @@
       name="q"
       id="cargo-desktop-search"
       placeholder="Click or press 'S' to search..."
-      value={{this.searchQuery}}
-      oninput={{action (mut this.searchQuery) value="target.value"}}
+      value={{this.header.searchValue}}
+      oninput={{action (mut this.header.searchValue) value="target.value"}}
       autocorrect="off"
       autocapitalize="off"
       autofocus="autofocus"
@@ -103,8 +103,8 @@
       name="q"
       id="cargo-mobile-search"
       placeholder="Search"
-      value={{this.searchQuery}}
-      oninput={{action (mut this.searchQuery) value="target.value"}}
+      value={{this.header.searchValue}}
+      oninput={{action (mut this.header.searchValue) value="target.value"}}
       autocorrect="off"
       required
     >