From 33f21709f48d966deb102a553360edaa573ce874 Mon Sep 17 00:00:00 2001 From: eth3lbert Date: Tue, 5 Nov 2024 00:55:40 +0800 Subject: [PATCH 1/2] frontend: Migrate to use `default_version` and `yanked` --- app/components/crate-row.hbs | 6 +++--- app/models/crate.js | 22 +++++++--------------- app/routes/crate/dependencies.js | 4 ++-- app/routes/crate/version.js | 4 ++-- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/app/components/crate-row.hbs b/app/components/crate-row.hbs index 9b864218530..c30208a2620 100644 --- a/app/components/crate-row.hbs +++ b/app/components/crate-row.hbs @@ -6,10 +6,10 @@ {{@crate.name}} {{/let}} - {{#if @crate.defaultVersion}} - v{{@crate.defaultVersion}} + {{#if (and @crate.default_version (not @crate.yanked))}} + v{{@crate.default_version}} v.id); diff --git a/app/routes/crate/dependencies.js b/app/routes/crate/dependencies.js index a8675955755..ec0a3b0c1f6 100644 --- a/app/routes/crate/dependencies.js +++ b/app/routes/crate/dependencies.js @@ -8,8 +8,8 @@ export default class VersionRoute extends Route { let crate = this.modelFor('crate'); let versions = await crate.get('versions'); - let { defaultVersion } = crate; - let version = versions.find(version => version.num === defaultVersion) ?? versions.lastObject; + let { default_version } = crate; + let version = versions.find(version => version.num === default_version) ?? versions.lastObject; this.router.replaceWith('crate.version-dependencies', crate, version.num); } diff --git a/app/routes/crate/version.js b/app/routes/crate/version.js index ef51739ece0..41bf71de95c 100644 --- a/app/routes/crate/version.js +++ b/app/routes/crate/version.js @@ -31,8 +31,8 @@ export default class VersionRoute extends Route { return this.router.replaceWith('catch-all', { transition, title }); } } else { - let { defaultVersion } = crate; - version = versions.find(version => version.num === defaultVersion); + let { default_version } = crate; + version = versions.find(version => version.num === default_version); if (!version) { let versionNums = versions.map(it => it.num); From 4690cd2d526b7c6e67dfa2e5fdab6a3447549f80 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 4 Nov 2024 19:06:42 +0100 Subject: [PATCH 2/2] Update app/models/crate.js --- app/models/crate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/crate.js b/app/models/crate.js index 4a40ab6f31a..e84ac9df565 100644 --- a/app/models/crate.js +++ b/app/models/crate.js @@ -13,7 +13,7 @@ export default class Crate extends Model { /** * This is the default version that will be shown when visiting the crate * details page. Note that this value can be `null`, which may be unexpected. - * @return {string} + * @type {string | null} */ @attr default_version; @attr yanked;