Auto merge of #2802 - Turbo87:pagination, r=locks

Replace `pagination` mixin with computed property macro

... and then finally enable the `no-mixin` ESLint rule

r? `@locks`

Author: bors

.eslintrc.js

@@ -18,7 +18,6 @@ module.exports = {
 
     'ember/no-empty-attrs': 'off',
     'ember/no-get': 'off',
-    'ember/no-mixins': 'off',
     'ember/require-computed-property-dependencies': 'off',
 
     'import-helpers/order-imports': [

app/components/pagination.hbs

@@ -1,17 +1,17 @@
 <nav local-class='pagination' aria-label="Pagination navigation">
-  <LinkTo @query={{hash page=@prevPage}} local-class="prev" @rel="prev" @title="previous page" data-test-pagination-prev>
+  <LinkTo @query={{hash page=@pagination.prevPage}} local-class="prev" @rel="prev" @title="previous page" data-test-pagination-prev>
     {{svg-jar "left-pag"}}
   </LinkTo>
   <ol>
-    {{#each @pages as |page|}}
+    {{#each @pagination.pages as |page|}}
       <li>
         <LinkTo @query={{hash page=page}} @title={{concat "Go to page " page}}>
           {{ page }}
         </LinkTo>
       </li>
     {{/each}}
   </ol>
-  <LinkTo @query={{hash page=@nextPage}} local-class="next" @rel="next" @title="next page" data-test-pagination-next>
+  <LinkTo @query={{hash page=@pagination.nextPage}} local-class="next" @rel="next" @title="next page" data-test-pagination-next>
     {{svg-jar "right-pag"}}
   </LinkTo>
 </nav>

app/controllers/categories.js

@@ -2,15 +2,16 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../mixins/pagination';
+import { pagination } from '../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 100,
   sort: 'alpha',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     return this.sort === 'crates' ? '# Crates' : 'Alphabetical';

app/controllers/category/index.js

@@ -2,15 +2,16 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../../mixins/pagination';
+import { pagination } from '../../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 10,
   sort: 'recent-downloads',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   category: null,
 

app/controllers/crate/reverse-dependencies.js

@@ -1,13 +1,14 @@
 import Controller from '@ember/controller';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../../mixins/pagination';
+import { pagination } from '../../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page'],
   page: '1',
   per_page: 10,
   crate: null,
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 });

app/controllers/crates.js

@@ -2,9 +2,9 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../mixins/pagination';
+import { pagination } from '../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['letter', 'page', 'per_page', 'sort'],
   letter: null,
   page: '1',
@@ -13,6 +13,7 @@ export default Controller.extend(PaginationMixin, {
   alphabet: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     if (this.sort === 'downloads') {

app/controllers/keyword/index.js

@@ -2,15 +2,16 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../../mixins/pagination';
+import { pagination } from '../../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 10,
   sort: 'recent-downloads',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     if (this.sort === 'downloads') {

app/controllers/keywords.js

@@ -2,15 +2,16 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../mixins/pagination';
+import { pagination } from '../utils/pagination';
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 10,
   sort: 'crates',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     return this.sort === 'crates' ? '# Crates' : 'Alphabetical';

app/controllers/me/crates.js

@@ -2,17 +2,18 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../../mixins/pagination';
+import { pagination } from '../../utils/pagination';
 
 // TODO: reduce duplicatoin with controllers/crates
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 10,
   sort: 'alpha',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     if (this.sort === 'downloads') {

app/controllers/me/following.js

@@ -2,17 +2,18 @@ import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import PaginationMixin from '../../mixins/pagination';
+import { pagination } from '../../utils/pagination';
 
 // TODO: reduce duplicatoin with controllers/me/crates
 
-export default Controller.extend(PaginationMixin, {
+export default Controller.extend({
   queryParams: ['page', 'per_page', 'sort'],
   page: '1',
   per_page: 10,
   sort: 'alpha',
 
   totalItems: readOnly('model.meta.total'),
+  pagination: pagination(),
 
   currentSortBy: computed('sort', function () {
     return this.sort === 'downloads' ? 'Downloads' : 'Alphabetical';