Skip to content

Fix legacy redirects #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2017
Merged

Fix legacy redirects #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions app/routes/class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
import { hash, resolve } from 'rsvp';
import Route from '@ember/routing/route';
import getLastVersion from 'ember-api-docs/utils/get-last-version';
//import getLastVersion from 'ember-api-docs/utils/get-last-version';
import { pluralize } from 'ember-inflector';

export default Route.extend({

model(params) {
return this.get('store').findRecord('project', 'ember', { includes: 'project-version' })
.then((project) => {
let versions = project.get('projectVersions').toArray();
let lastVersion = getLastVersion(versions);
//let versions = project.get('projectVersions').toArray();
//let lastVersion = getLastVersion(versions);
// Currently redirecting to last 2.15 version until we can map old
// Ember.* apis with rfc 176 items
let lastVersion = '2.15.3';
return this.get('store').findRecord('project-version', `ember-${lastVersion}`, { includes: 'project' });
})
.then((projectVersion) => {
let project = projectVersion.get('project');
let lastVersion = projectVersion.get('version');
//peel off the .html
let className = params['class'].substr(0, params['class'].lastIndexOf('.'));
let id = `ember-${lastVersion}-${className}`;

return hash({
project: resolve(project),
version: resolve(lastVersion),
Expand All @@ -35,8 +44,8 @@ export default Route.extend({
return this.transitionTo('project-version');
})
});
})
.catch((e) => {

}).catch((e) => {
return this.transitionTo('project-version');
});
},
Expand Down
12 changes: 9 additions & 3 deletions app/routes/data-class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import { hash, resolve } from 'rsvp';
import Route from '@ember/routing/route';
import getLastVersion from 'ember-api-docs/utils/get-last-version';
//import getLastVersion from 'ember-api-docs/utils/get-last-version';
import { pluralize } from 'ember-inflector';

export default Route.extend({

model(params) {
return this.get('store').findRecord('project', 'ember-data', { includes: 'project-version' })
.then((project) => {
let versions = project.get('projectVersions').toArray();
let lastVersion = getLastVersion(versions);
// let versions = project.get('projectVersions').toArray();
// let lastVersion = getLastVersion(versions);
let lastVersion = '2.15.3';
return this.get('store').findRecord('project-version', `ember-data-${lastVersion}`, { includes: 'project' });
})
.then((projectVersion) => {
let project = projectVersion.get('project');
let lastVersion = projectVersion.get('version');
let className = params['class'].substr(0, params['class'].lastIndexOf('.'));
let id = `ember-data-${lastVersion}-${className}`;
return hash({
Expand Down
19 changes: 14 additions & 5 deletions app/routes/data-module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
import { hash, resolve } from 'rsvp';
import Route from '@ember/routing/route';
import getLastVersion from 'ember-api-docs/utils/get-last-version';
//import getLastVersion from 'ember-api-docs/utils/get-last-version';
import { pluralize } from 'ember-inflector';

export default Route.extend({

model(params) {
return this.get('store').findRecord('project', 'ember-data', { includes: 'project-version' })
.then((project) => {
let versions = project.get('projectVersions').toArray();
let lastVersion = getLastVersion(versions);
// let versions = project.get('projectVersions').toArray();
// let lastVersion = getLastVersion(versions);
let lastVersion = '2.15.3';
return this.get('store').findRecord('project-version', `ember-data-${lastVersion}`, { includes: 'project' });
})
.then((projectVersion) => {
let project = projectVersion.get('project');
let lastVersion = projectVersion.get('version');
let className = params['module'].substr(0, params['module'].lastIndexOf('.'));
let id = `ember-data-${lastVersion}-${className}`;
return hash({
project: resolve(project),
version: resolve(lastVersion),
classData: this.store.find('class', id)
classData: this.store.find('module', id)
.then((classData) => {
return {
type: 'class',
type: 'module',
data: classData
};
})
.catch((e) => {
return this.transitionTo('project-version');
})
});

}).catch((e) => {
return this.transitionTo('project-version');
});
},

Expand Down
23 changes: 17 additions & 6 deletions app/routes/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { hash, resolve } from 'rsvp';
import Route from '@ember/routing/route';
import getLastVersion from 'ember-api-docs/utils/get-last-version';
//import getLastVersion from 'ember-api-docs/utils/get-last-version';

import { pluralize } from 'ember-inflector';

Expand All @@ -9,19 +9,30 @@ export default Route.extend({
model(params) {
return this.get('store').findRecord('project', 'ember', { includes: 'project-version' })
.then(project => {
let versions = project.get('projectVersions').toArray();
let lastVersion = getLastVersion(versions);
// let versions = project.get('projectVersions').toArray();
// let lastVersion = getLastVersion(versions);
let lastVersion = '2.15.3';
return this.get('store').findRecord('project-version', `ember-${lastVersion}`, { includes: 'project' });
})
.then((projectVersion) => {
let project = projectVersion.get('project');
let lastVersion = projectVersion.get('version');
let className = params['module'].substr(0, params['module'].lastIndexOf('.'));
let id = `ember-${lastVersion}-${className}`;

return hash({
project: resolve(project),
version: resolve(lastVersion),
classData: this.store.find('module', id).then(classData => {
return { type: 'module', data: classData };
})
classData: this.store.find('module', id)
.then(classData => {
return { type: 'module', data: classData };
})
.catch((e) => {
return this.transitionTo('project-version');
})

});

}).catch((e) => {
return this.transitionTo('project-version');
});
Expand Down