Skip to content

Commit

Permalink
ember: Fix routing.transition-methods deprecations (#3109)
Browse files Browse the repository at this point in the history
This is mostly a mechanical replacement of
transitionTo/transitionToRoute with this.router.transitionTo.

There’s a new test helper in web-client called visitWithQueryFix to
bypass failures described in this issue:
emberjs/ember.js#17118
  • Loading branch information
backspace authored Jul 27, 2022
1 parent 2de9dd8 commit 35d3ca3
Show file tree
Hide file tree
Showing 26 changed files with 124 additions and 54 deletions.
11 changes: 7 additions & 4 deletions packages/boxel/tests/dummy/app/controllers/media-registry.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import METADATASTEPS from '../data/amend-metadata-steps';
import MILESTONES from '../data/catalog-transfer-workflow';

export default class MediaRegistryController extends Controller {
@service router;

@tracked actionSteps = METADATASTEPS;
@tracked milestones = MILESTONES;

Expand All @@ -22,23 +25,23 @@ export default class MediaRegistryController extends Controller {

if (this.model.currentOrg.id !== id) {
if (currentRouteName === 'media-registry.agreements') {
return this.transitionToRoute(
return this.router.transitionTo(
'media-registry.agreements',
id,
'TA-38185847898'
);
}

if (currentRouteName === 'media-registry.cardflow') {
return this.transitionToRoute('media-registry.cardflow', id);
return this.router.transitionTo('media-registry.cardflow', id);
}
}

this.transitionToRoute('media-registry', id);
this.router.transitionTo('media-registry', id);
}

@action
goHome() {
this.transitionToRoute('media-registry.index', this.model.orgs[0].id);
this.router.transitionTo('media-registry.index', this.model.orgs[0].id);
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';

export default class MediaRegistryAgreementsController extends Controller {
@service router;

@tracked status;
@tracked org = this.model.org;
@tracked catalog = this.model.collection;
Expand Down Expand Up @@ -38,7 +41,7 @@ export default class MediaRegistryAgreementsController extends Controller {

@action
rejectAgreement() {
this.transitionToRoute(
this.router.transitionTo(
'media-registry.collection',
'bunny_records',
this.catalog.id
Expand All @@ -57,7 +60,7 @@ export default class MediaRegistryAgreementsController extends Controller {

@action
expandAction() {
this.transitionToRoute(
this.router.transitionTo(
'media-registry.collection',
'bunny_records',
this.catalog.id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import MediaRegistryIndexController from 'dummy/controllers/media-registry/index';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';

export default class MediaRegistryCollectionController extends MediaRegistryIndexController {
@service router;

@action
transitionToIsolate(item) {
this.transitionToRoute('media-registry.item', item.id);
this.router.transitionTo('media-registry.item', item.id);
}

@action
transitionToView() {
this.transitionToRoute('media-registry.collection', this.model.id);
this.router.transitionTo('media-registry.collection', this.model.id);
}

@action
transitionToEdit() {
this.transitionToRoute('media-registry.collection.edit', this.model.id);
this.router.transitionTo('media-registry.collection.edit', this.model.id);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default class MediaRegistryDiscrepanciesDiscrepancyCardController extends Controller {
omittedFields = ['verifi_id'];
Expand All @@ -15,12 +16,14 @@ export default class MediaRegistryDiscrepanciesDiscrepancyCardController extends
'expandable',
];

@service router;

@action
drillDown(field, value) {
let innerCardType = field.title;
let innerCardId = value.id || value.value[0].id;

this.transitionToRoute(
this.router.transitionTo(
'media-registry.discrepancies.discrepancy.card.card',
innerCardType,
innerCardId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import MediaRegistryDiscrepanciesDiscrepancyCardController from '../card';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default class MediaRegistryDiscrepanciesDiscrepancyCardCardController extends MediaRegistryDiscrepanciesDiscrepancyCardController {
@service router;

@action
drillDown(field, value) {
let innerCardCardType = field.title;
let innerCardCardId = value.id || value.value[0].id;

this.transitionToRoute(
this.router.transitionTo(
'media-registry.discrepancies.discrepancy.card.card.card',
innerCardCardType,
innerCardCardId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default class MediaRegistryDiscrepanciesDiscrepancyController extends Controller {
omittedFields = ['verifi_id'];
Expand All @@ -14,11 +15,13 @@ export default class MediaRegistryDiscrepanciesDiscrepancyController extends Con
'expandable',
];

@service router;

@action
drillDown(field, value) {
let cardType = field.title;
let cardId = value.id;
this.transitionToRoute(
this.router.transitionTo(
'media-registry.discrepancies.discrepancy.card',
cardType,
cardId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import Controller from '@ember/controller';
import { action, get } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { compare, isBlank } from '@ember/utils';
import { inject as service } from '@ember/service';

export default class MediaRegistryDiscrepanciesIndexComponent extends Controller {
queryParams = ['version'];
@service router;
@tracked version = null;

removed = [];
Expand Down Expand Up @@ -45,6 +47,9 @@ export default class MediaRegistryDiscrepanciesIndexComponent extends Controller

@action
expandAction(item) {
this.transitionToRoute('media-registry.discrepancies.discrepancy', item.id);
this.router.transitionTo(
'media-registry.discrepancies.discrepancy',
item.id
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ import Controller from '@ember/controller';
import { action, get } from '@ember/object';
import { compare, isBlank } from '@ember/utils';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';

export default class MediaRegistryIndexController extends Controller {
queryParams = ['version'];
removed = [];

@service router;

@tracked version = null;

get collection() {
Expand All @@ -23,17 +26,17 @@ export default class MediaRegistryIndexController extends Controller {
@action
transitionToIsolate(item) {
if (this.model.type === 'master-collection') {
return this.transitionToRoute('media-registry.collection', item.id);
return this.router.transitionTo('media-registry.collection', item.id);
}

if (this.version) {
return this.transitionToRoute(
return this.router.transitionTo(
'media-registry.version',
item.id,
this.version
);
}
this.transitionToRoute('media-registry.item', item.id);
this.router.transitionTo('media-registry.item', item.id);
}

@action
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import { titleize } from 'dummy/utils/titleize';
import { formatId } from 'dummy/utils/format-id';

export default class MediaRegistryItemController extends Controller {
@service router;

get album() {
if (!this.model.album) {
return null;
Expand All @@ -27,24 +30,24 @@ export default class MediaRegistryItemController extends Controller {

@action
transitionToEdit() {
this.transitionToRoute('media-registry.item.edit', this.model.id);
this.router.transitionTo('media-registry.item.edit', this.model.id);
}

@action
transitionToView() {
this.transitionToRoute('media-registry.item', this.model.id);
this.router.transitionTo('media-registry.item', this.model.id);
}

@action
transitionToProduct() {
this.transitionToRoute(
this.router.transitionTo(
'media-registry.products.album',
formatId(this.model.album)
);
}

@action
transitionToCatalog(id) {
this.transitionToRoute('media-registry.collection', id);
this.router.transitionTo('media-registry.collection', id);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';

export default class MediaRegistryProductsAlbumController extends Controller {
@service router;

get headerDetailFields() {
if (!this.model) {
return null;
Expand Down Expand Up @@ -95,14 +98,14 @@ export default class MediaRegistryProductsAlbumController extends Controller {

@action
transitionToCatalog(id) {
this.transitionToRoute('media-registry.collection', id);
this.router.transitionTo('media-registry.collection', id);
}

@action
transitionToItem(item) {
if (!item || !item.id) {
return;
}
this.transitionToRoute('media-registry.item', item.id);
this.router.transitionTo('media-registry.item', item.id);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';

export default class MediaRegistryVersionController extends Controller {
queryParams = ['version'];
@service router;
@tracked version = this.model ? this.model.version : null;

get item() {
Expand All @@ -18,12 +20,12 @@ export default class MediaRegistryVersionController extends Controller {

@action
transitionToView() {
this.transitionToRoute('media-registry.version', this.model.id);
this.router.transitionTo('media-registry.version', this.model.id);
}

@action
transitionToCatalog(id) {
this.transitionToRoute('media-registry.collection', id, {
this.router.transitionTo('media-registry.collection', id, {
queryParams: { version: this.model.version },
});
}
Expand Down
8 changes: 5 additions & 3 deletions packages/boxel/tests/dummy/app/controllers/workflow/org.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';

export default class WorkflowOrgController extends Controller {
@service router;
@tracked currentCard = this.model.orgQueueCards[0];

@action
selectCard(card) {
this.currentCard = card;
this.transitionToRoute('workflow.org.thread', card.id);
this.router.transitionTo('workflow.org.thread', card.id);
}

@action goHome() {
this.transitionToRoute('workflow');
this.router.transitionTo('workflow');
}

@action transitionTo(orgId) {
this.transitionToRoute('workflow.org', orgId);
this.router.transitionTo('workflow.org', orgId);
}
}
5 changes: 4 additions & 1 deletion packages/boxel/tests/dummy/app/routes/home.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

export default class HomeRoute extends Route {
@service router;

async beforeModel(transition) {
await super.beforeModel(transition);
this.transitionTo('media-registry', 'bunny_records');
this.router.transitionTo('media-registry', 'bunny_records');
}
}
5 changes: 4 additions & 1 deletion packages/boxel/tests/dummy/app/routes/workflow/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

export default class WorkflowIndexRoute extends Route {
@service router;

async beforeModel(transition) {
await super.beforeModel(transition);
const { userOrgs } = this.modelFor('workflow');
this.transitionTo('workflow.org', userOrgs[0].id);
this.router.transitionTo('workflow.org', userOrgs[0].id);
}
}
5 changes: 4 additions & 1 deletion packages/boxel/tests/dummy/app/routes/workflow/org/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

export default class WorkflowOrgIndexRoute extends Route {
@service router;

async beforeModel(transition) {
await super.beforeModel(transition);
const { orgQueueCards } = this.modelFor('workflow.org');
this.transitionTo('workflow.org.thread', orgQueueCards[0].id);
this.router.transitionTo('workflow.org.thread', orgQueueCards[0].id);
}
}
Loading

0 comments on commit 35d3ca3

Please sign in to comment.