Skip to content

Commit 1d85068

Browse files
committed
Auto merge of #4065 - Turbo87:store-injection, r=pichfl
Explicitly inject the `store` service The implicit injection in routes and controllers has been deprecated
2 parents ca3ae01 + 46d6d83 commit 1d85068

21 files changed

+53
-0
lines changed

app/controllers/dashboard.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { A } from '@ember/array';
22
import Controller from '@ember/controller';
3+
import { inject as service } from '@ember/service';
34

45
import { task } from 'ember-concurrency';
56
import { alias } from 'macro-decorators';
@@ -9,6 +10,8 @@ import ajax from '../utils/ajax';
910
const TO_SHOW = 5;
1011

1112
export default class DashboardController extends Controller {
13+
@service store;
14+
1215
hasMore = false;
1316
myFeed = A();
1417

app/controllers/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { reads } from 'macro-decorators';
77

88
export default class IndexController extends Controller {
99
@service fetcher;
10+
@service store;
1011

1112
@reads('dataTask.lastSuccessful.value') model;
1213

app/controllers/search.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Controller from '@ember/controller';
22
import { action } from '@ember/object';
3+
import { inject as service } from '@ember/service';
34
import { tracked } from '@glimmer/tracking';
45

56
import { task } from 'ember-concurrency';
@@ -8,6 +9,8 @@ import { bool, reads } from 'macro-decorators';
89
import { pagination } from '../utils/pagination';
910

1011
export default class SearchController extends Controller {
12+
@service store;
13+
1114
queryParams = ['all_keywords', 'page', 'per_page', 'q', 'sort'];
1215
@tracked all_keywords;
1316
@tracked q = null;

app/models/user.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import Model, { attr } from '@ember-data/model';
2+
import { inject as service } from '@ember/service';
23

34
import { memberAction } from 'ember-api-actions';
45

56
export default class User extends Model {
7+
@service store;
8+
69
@attr email;
710
@attr email_verified;
811
@attr email_verification_sent;

app/routes/categories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class CategoriesRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
page: { refreshModel: true },
69
sort: { refreshModel: true },

app/routes/category-slugs.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class CategorySlugsRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
page: { refreshModel: true },
69
sort: { refreshModel: true },

app/routes/category.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
44

55
export default class CategoryRoute extends Route {
66
@service notifications;
7+
@service store;
78

89
async model(params) {
910
try {

app/routes/category/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class CategoryIndexRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
page: { refreshModel: true },
69
sort: { refreshModel: true },

app/routes/crate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
33

44
export default class CrateRoute extends Route {
55
@service notifications;
6+
@service store;
67

78
async model(params) {
89
try {

app/routes/crate/reverse-dependencies.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
33

44
export default class ReverseDependenciesRoute extends Route {
55
@service notifications;
6+
@service store;
67

78
queryParams = {
89
page: { refreshModel: true },

app/routes/crates.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class CratesRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
letter: { refreshModel: true },
69
page: { refreshModel: true },

app/routes/dashboard.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { A } from '@ember/array';
2+
import { inject as service } from '@ember/service';
23
import RSVP from 'rsvp';
34

45
import AuthenticatedRoute from './-authenticated-route';
56

67
export default class DashboardRoute extends AuthenticatedRoute {
8+
@service store;
9+
710
async model() {
811
let user = this.session.currentUser;
912

app/routes/keyword.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
44

55
export default class KeywordRoute extends Route {
66
@service notifications;
7+
@service store;
78

89
async model({ keyword_id }) {
910
try {

app/routes/keyword/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class KeywordIndexRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
page: { refreshModel: true },
69
sort: { refreshModel: true },

app/routes/keywords.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23

34
export default class KeywordsRoute extends Route {
5+
@service store;
6+
47
queryParams = {
58
page: { refreshModel: true },
69
sort: { refreshModel: true },

app/routes/me/crates.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import { inject as service } from '@ember/service';
2+
13
import AuthenticatedRoute from '../-authenticated-route';
24

35
export default class MeCratesRoute extends AuthenticatedRoute {
6+
@service store;
7+
48
queryParams = {
59
page: { refreshModel: true },
610
sort: { refreshModel: true },

app/routes/me/following.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import { inject as service } from '@ember/service';
2+
13
import AuthenticatedRoute from '../-authenticated-route';
24

35
export default class FollowingRoute extends AuthenticatedRoute {
6+
@service store;
7+
48
queryParams = {
59
page: { refreshModel: true },
610
sort: { refreshModel: true },

app/routes/me/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import { inject as service } from '@ember/service';
2+
13
import AuthenticatedRoute from '../-authenticated-route';
24

35
export default class MeIndexRoute extends AuthenticatedRoute {
6+
@service store;
7+
48
async model() {
59
let { ownedCrates, currentUser: user } = this.session;
610

app/routes/me/pending-invites.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import { inject as service } from '@ember/service';
2+
13
import AuthenticatedRoute from '../-authenticated-route';
24

35
export default class PendingInvitesRoute extends AuthenticatedRoute {
6+
@service store;
7+
48
model() {
59
return this.store.findAll('crate-owner-invite');
610
}

app/routes/team.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
33

44
export default class TeamRoute extends Route {
55
@service notifications;
6+
@service store;
67

78
queryParams = {
89
page: { refreshModel: true },

app/routes/user.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
33

44
export default class UserRoute extends Route {
55
@service notifications;
6+
@service store;
67

78
queryParams = {
89
page: { refreshModel: true },

0 commit comments

Comments
 (0)