Skip to content

Simplify README loading code #2379

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 4 commits into from
Mar 31, 2020
Merged

Simplify README loading code #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a50fda4
crate.version: Move README download into the controller
Turbo87 Feb 21, 2020
d84e99d
crate.version: Convert `loadReadme()` to async/await
Turbo87 Feb 21, 2020
44472fc
crate.version: Remove unnecessary `readme` observer
Turbo87 Feb 21, 2020
0db37c8
crate.version: Convert `loadReadme()` to ember-concurrency task
Turbo87 Mar 30, 2020
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
33 changes: 22 additions & 11 deletions app/controllers/crate/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
import ArrayProxy from '@ember/array/proxy';
// eslint-disable-next-line ember/no-observers
import { computed, observer } from '@ember/object';
import { computed } from '@ember/object';
import moment from 'moment';
import { task } from 'ember-concurrency';

const NUM_VERSIONS = 5;

Expand Down Expand Up @@ -157,15 +157,26 @@ export default Controller.extend({
return data;
}),

// eslint-disable-next-line ember/no-observers
report: observer('crate.readme', function () {
if (typeof document === 'undefined') {
return;
loadReadmeTask: task(function* () {
if (this.currentVersion.get('readme_path')) {
try {
let r = yield fetch(this.currentVersion.get('readme_path'));
if (r.ok) {
this.crate.set('readme', yield r.text());

if (typeof document !== 'undefined') {
setTimeout(() => {
let e = document.createEvent('CustomEvent');
e.initCustomEvent('hashchange', true, true);
window.dispatchEvent(e);
});
}
} else {
this.crate.set('readme', null);
}
} catch (error) {
this.crate.set('readme', null);
}
}
setTimeout(() => {
let e = document.createEvent('CustomEvent');
e.initCustomEvent('hashchange', true, true);
window.dispatchEvent(e);
});
}),
});
23 changes: 5 additions & 18 deletions app/routes/crate/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import prerelease from 'semver/functions/prerelease';

import fetch from 'fetch';

import ajax from '../../utils/ajax';

export default Route.extend({
Expand Down Expand Up @@ -93,23 +91,12 @@ export default Route.extend({
this.flashMessages.queue(`Version '${params.version_num}' of crate '${crate.get('name')}' does not exist`);
}

const result = version || versions.find(version => version.get('num') === maxVersion) || versions.objectAt(0);

if (result.get('readme_path')) {
fetch(result.get('readme_path'))
.then(async r => {
if (r.ok) {
crate.set('readme', await r.text());
} else {
crate.set('readme', null);
}
})
.catch(() => {
crate.set('readme', null);
});
}
return version || versions.find(version => version.get('num') === maxVersion) || versions.objectAt(0);
},

return result;
setupController(controller) {
this._super(...arguments);
controller.loadReadmeTask.perform();
},

serialize(model) {
Expand Down