Skip to content

Commit 997ff74

Browse files
authored
enh: Move ember-table query params init to mixin (#3245)
1 parent 8df2d0b commit 997ff74

File tree

7 files changed

+40
-22
lines changed

7 files changed

+40
-22
lines changed

app/controllers/events/list.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import Controller from '@ember/controller';
22
import { computed, action } from '@ember/object';
3+
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
4+
5+
export default class extends Controller.extend(EmberTableControllerMixin) {
36

4-
export default class extends Controller {
5-
queryParams = ['page', 'per_page'];
6-
page = 1;
7-
per_page = 10;
8-
search = null;
9-
sort_dir = null;
10-
sort_by = null;
11-
sorts = [];
127
@computed()
138
get columns() {
149
return [

app/mixins/ember-table-controller.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import Mixin from '@ember/object/mixin';
2+
3+
export default Mixin.create({
4+
queryParams : ['page', 'per_page', 'search', 'sort_dir', 'sort_by'],
5+
page : 1,
6+
per_page : 10,
7+
search : null,
8+
sort_dir : null,
9+
sort_by : null,
10+
sorts : []
11+
});
File renamed without changes.

app/routes/events/list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Route from '@ember/routing/route';
22
import { action } from '@ember/object';
33
import moment from 'moment';
4-
import EmberTableMixin from 'open-event-frontend/mixins/ember-table';
5-
export default class extends Route.extend(EmberTableMixin) {
4+
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
5+
export default class extends Route.extend(EmberTableRouteMixin) {
66

77
titleToken() {
88
switch (this.get('params.event_state')) {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import EmberObject from '@ember/object';
2+
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
3+
import { module, test } from 'qunit';
4+
5+
module('Unit | Mixin | ember-table-controller', function() {
6+
// Replace this with your real tests.
7+
test('it works', function(assert) {
8+
let EmberTableControllerObject = EmberObject.extend(EmberTableControllerMixin);
9+
let subject = EmberTableControllerObject.create();
10+
assert.ok(subject);
11+
});
12+
});
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import EmberObject from '@ember/object';
2+
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
3+
import { module, test } from 'qunit';
4+
5+
module('Unit | Mixin | ember-table-route', function() {
6+
// Replace this with your real tests.
7+
test('it works', function(assert) {
8+
let EmberTableRouteObject = EmberObject.extend(EmberTableRouteMixin);
9+
let subject = EmberTableRouteObject.create();
10+
assert.ok(subject);
11+
});
12+
});

tests/unit/mixins/ember-table-test.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)