Skip to content

crate.versions: Add "Sort By" dropdown with "Date" and "SemVer" options #3278

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.

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
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/sort-dropdown/option.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<@menu.Item>
<@menu.Item ...attributes>
<LinkTo @query={{@query}}>{{yield}}</LinkTo>
</@menu.Item>
20 changes: 20 additions & 0 deletions app/controllers/crate/versions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import Controller from '@ember/controller';
import { tracked } from '@glimmer/tracking';

export default class SearchController extends Controller {
queryParams = ['sort'];

@tracked sort;

get currentSortBy() {
return this.sort === 'semver' ? 'SemVer' : 'Date';
}

get sortedVersions() {
let versions = this.model.versions.toArray();

return this.sort === 'semver'
? versions.sort((a, b) => b.semver.compare(a.semver))
: versions.sort((a, b) => b.created_at - a.created_at);
}
}
7 changes: 5 additions & 2 deletions app/styles/crate/versions.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.back-link {
margin-bottom: 20px;
.results-meta {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
}

.page-description {
Expand Down
18 changes: 15 additions & 3 deletions app/templates/crate/versions.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<CrateHeader @crate={{this.model}} />

<LinkTo @route="crate" @model={{this.model}} local-class="back-link">&#11013; Back to Main Page</LinkTo>
<div local-class="results-meta">
<LinkTo @route="crate" @model={{this.model}} local-class="back-link">
&#11013; Back to Main Page
</LinkTo>

<div data-test-search-sort>
<span local-class="sort-by-label">Sort by </span>
<SortDropdown @current={{this.currentSortBy}} as |sd|>
<sd.Option @query={{hash sort="date"}} data-test-date-sort>Date</sd.Option>
<sd.Option @query={{hash sort="semver"}} data-test-semver-sort>SemVer</sd.Option>
</SortDropdown>
</div>
</div>

<span local-class="page-description" data-test-page-description>
All <strong>{{ this.model.versions.length }}</strong>
Expand All @@ -9,9 +21,9 @@
</span>

<ul local-class="list">
{{#each this.model.versions as |version|}}
{{#each this.sortedVersions as |version|}}
<li>
<VersionList::Row @version={{version}} local-class="row" />
<VersionList::Row @version={{version}} local-class="row" data-test-version={{version.num}} />
</li>
{{/each}}
</ul>
28 changes: 28 additions & 0 deletions tests/acceptance/versions-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { click, currentURL, findAll, visit } from '@ember/test-helpers';
import { module, test } from 'qunit';

import { setupApplicationTest } from 'cargo/tests/helpers';

module('Acceptance | crate versions page', function (hooks) {
setupApplicationTest(hooks);

test('show versions sorted by date', async function (assert) {
let crate = this.server.create('crate', { name: 'nanomsg' });
this.server.create('version', { crate, num: '0.1.0', created_at: '2017-01-01' });
this.server.create('version', { crate, num: '0.2.0', created_at: '2018-01-01' });
this.server.create('version', { crate, num: '0.3.0', created_at: '2019-01-01' });
this.server.create('version', { crate, num: '0.2.1', created_at: '2020-01-01' });

await visit('/crates/nanomsg/versions');
assert.equal(currentURL(), '/crates/nanomsg/versions');

let versions = findAll('[data-test-version]').map(it => it.dataset.testVersion);
assert.deepEqual(versions, ['0.2.1', '0.3.0', '0.2.0', '0.1.0']);

await click('[data-test-current-order]');
await click('[data-test-semver-sort] a');

versions = findAll('[data-test-version]').map(it => it.dataset.testVersion);
assert.deepEqual(versions, ['0.3.0', '0.2.1', '0.2.0', '0.1.0']);
});
});