application: Move searchQuery property to the search service

Author: Turbo87

app/controllers/application.js

@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { oneWay } from '@ember/object/computed';
 import { on } from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 
@@ -8,7 +7,6 @@ import { EKMixin, keyDown, keyPress } from 'ember-keyboard';
 export default Controller.extend(EKMixin, {
   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.search.inputValue,
           page: 1,
         },
       });

app/routes/index.js

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 
 export default Route.extend({
   fastboot: service(),
+  search: service(),
 
   headTags() {
     return [
@@ -17,7 +18,7 @@ export default Route.extend({
   },
 
   setupController(controller) {
-    this.controllerFor('application').set('searchQuery', null);
+    this.search.set('inputValue', null);
 
     if (!controller.dataTask.hasData) {
       let promise = controller.dataTask.perform();

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({
+  search: service(),
+
   queryParams: {
     all_keywords: { refreshModel: true },
     page: { refreshModel: true },
@@ -15,7 +18,7 @@ export default Route.extend({
   },
 
   setupController(controller, params) {
-    this.controllerFor('application').set('searchQuery', params.q);
+    this.search.set('inputValue', params.q);
     controller.dataTask.perform(params);
   },
 });

app/services/search.js

@@ -1,5 +1,8 @@
+import { oneWay } from '@ember/object/computed';
 import Service from '@ember/service';
 
 export default class SearchService extends Service {
   q = null;
+
+  @oneWay('q') inputValue;
 }

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.search.inputValue}}
+      oninput={{action (mut this.search.inputValue) 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.search.inputValue}}
+      oninput={{action (mut this.search.inputValue) value="target.value"}}
       autocorrect="off"
       required
     >