Merge pull request DockYard#33 from emberobserver/kg-refactor-search

Move search up to the application template

app/controllers/addons.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/application.js

@@ -1,4 +1,8 @@
 import Ember from 'ember';
+import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend({
+export default Ember.Controller.extend(ControllerWithSearch, {
+  shouldShowCategories: Ember.computed('currentRouteName', function() {
+    return this.get('currentRouteName') !== 'addons.show';
+  })
 });

app/controllers/categories.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/index.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/lists.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/maintainers.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/model-not-found.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/controllers/not-found.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ControllerWithSearch from '../mixins/controller-with-search';
 
-export default Ember.Controller.extend(ControllerWithSearch, {
+export default Ember.Controller.extend({
 });

app/routes/addons.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/application.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(RouteWithSearch, {
   beforeModel: function() {
     this.get('session').fetch();
   },

app/routes/categories.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/index.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/lists.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/maintainers.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/model-not-found.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/routes/not-found.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import scrollFix from '../mixins/scroll-fix';
-import RouteWithSearch from '../mixins/route-with-search';
 
-export default Ember.Route.extend(scrollFix, RouteWithSearch, {
+export default Ember.Route.extend(scrollFix, {
 });

app/templates/addons.hbs

@@ -1,3 +1 @@
-{{#page-layout-with-search query=query showCategories=false}}
-  {{outlet}}
-{{/page-layout-with-search}}
+{{outlet}}

app/templates/application.hbs

@@ -1,5 +1,7 @@
 <div class="container">
-  {{outlet}}
+  {{#page-layout-with-search query=query showCategories=shouldShowCategories}}
+    {{outlet}}
+  {{/page-layout-with-search}}
   <footer class="footer" role="contentinfo">
     <hr>
     <section class="sponsor">

app/templates/categories.hbs

@@ -1,3 +1 @@
-{{#page-layout-with-search query=query}}
-  {{outlet}}
-{{/page-layout-with-search}}
+{{outlet}}

app/templates/index.hbs

@@ -1,3 +1 @@
-{{#page-layout-with-search query=query}}
-  {{route-index class="route-index"}}
-{{/page-layout-with-search}}
+{{route-index class="route-index"}}

app/templates/lists.hbs

@@ -1,3 +1 @@
-{{#page-layout-with-search query=query}}
-  {{outlet}}
-{{/page-layout-with-search}}
+{{outlet}}

app/templates/maintainers.hbs

@@ -1,3 +1 @@
-{{#page-layout-with-search query=query}}
-  {{outlet}}
-{{/page-layout-with-search}}
+{{outlet}}

app/templates/model-not-found.hbs

@@ -1,5 +1,3 @@
-{{#page-layout-with-search query=query}}
-  <div class="not-found test-not-found">
-    <h1>Oops! We can't find what you were looking for. Try searching above?</h1>
-  </div>
-{{/page-layout-with-search}}
+<div class="not-found test-not-found">
+  <h1>Oops! We can't find what you were looking for. Try searching above?</h1>
+</div>

app/templates/not-found.hbs

@@ -1,5 +1,3 @@
-{{#page-layout-with-search query=query}}
-  <div class="not-found test-not-found">
-    <h1>Oops! We can't find what you were looking for. Try searching above?</h1>
-  </div>
-{{/page-layout-with-search}}
+<div class="not-found test-not-found">
+  <h1>Oops! We can't find what you were looking for. Try searching above?</h1>
+</div>

tests/acceptance/addons-test.js

@@ -39,6 +39,18 @@ test('displays 0 for score when addon has zero score', function(assert) {
   });
 });
 
+test('Does not display category list', function(assert) {
+  var addon = server.create('addon', {
+    name: 'test-addon'
+  });
+
+  visit(`/addons/${addon.name}`);
+
+  andThen(function() {
+    assert.notExists('.categories-list');
+  });
+});
+
 test('displays WIP for score when addon is WIP', function(assert) {
   var addon = server.create('addon', {
     name: 'test-wip',