Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Re-ordered Admin search results (#20166)

Browse source 
closes https://linear.app/tryghost/issue/MOM-106

- the search results can hide any matching authors/tags due to them appearing after matching posts which is typically a longer list that needs scrolling through
- changed the order to list matched authors and tags before posts, this matches the behaviour in our front-end search
This commit is contained in:
Kevin Ansfield 2024-05-08 14:35:23 +01:00 • committed by GitHub
parent 76c6e92006
commit 2cd0eb62a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ghost/admin/app/services/search.js
View file

@ -15,20 +15,6 @@ export default class SearchService extends Service {
isContentStale = true;
searchables = [
{
name: 'Posts',
model: 'post',
fields: ['id', 'url', 'title', 'status'],
idField: 'id',
titleField: 'title'
},
{
name: 'Pages',
model: 'page',
fields: ['id', 'url', 'title', 'status'],
idField: 'id',
titleField: 'title'
},
{
name: 'Staff',
model: 'user',
@ -42,6 +28,20 @@ export default class SearchService extends Service {
fields: ['slug', 'url', 'name'],
idField: 'slug',
titleField: 'name'
},
{
name: 'Posts',
model: 'post',
fields: ['id', 'url', 'title', 'status'],
idField: 'id',
titleField: 'title'
},
{
name: 'Pages',
model: 'page',
fields: ['id', 'url', 'title', 'status'],
idField: 'id',
titleField: 'title'
}
];

14
ghost/admin/tests/acceptance/search-test.js
View file

@ -74,12 +74,12 @@ describe('Acceptance: Search', function () {
// all groups are present
const groupNames = findAll('.ember-power-select-group-name');
expect(groupNames, 'group names').to.have.length(4);
expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Posts', 'Pages', 'Staff', 'Tags']);
expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']);
// correct results are found
const options = findAll('.ember-power-select-option');
expect(options, 'number of search results').to.have.length(4);
expect(options.map(el => el.textContent.trim())).to.deep.equal(['First post', 'First page', 'First user', 'First tag']);
expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']);
// first item is selected
expect(options[0]).to.have.attribute('aria-current', 'true');
@ -88,7 +88,7 @@ describe('Acceptance: Search', function () {
it('up/down arrows move selected item', async function () {
await visit('/dashboard');
await click('[data-test-button="search"]');
await typeInSearch('first');
await typeInSearch('first post');
expect(findAll('.ember-power-select-option')[0], 'first option (initial)').to.have.attribute('aria-current', 'true');
await triggerKeyEvent(trigger, 'keyup', 'ArrowDown');
expect(findAll('.ember-power-select-option')[0], 'second option (after down)').to.have.attribute('aria-current', 'true');
@ -99,7 +99,7 @@ describe('Acceptance: Search', function () {
it('navigates to editor when post selected (Enter)', async function () {
await visit('/dashboard');
await click('[data-test-button="search"]');
await typeInSearch('first');
await typeInSearch('first post');
await triggerKeyEvent(trigger, 'keydown', 'Enter');
expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`);
});
@ -107,7 +107,7 @@ describe('Acceptance: Search', function () {
it('navigates to editor when post selected (Clicked)', async function () {
await visit('/dashboard');
await click('[data-test-button="search"]');
await typeInSearch('first');
await typeInSearch('first post');
await click('.ember-power-select-option[aria-current="true"]');
expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`);
});
@ -155,12 +155,12 @@ describe('Acceptance: Search', function () {
// all groups are present
const groupNames = findAll('.ember-power-select-group-name');
expect(groupNames, 'group names').to.have.length(4);
expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Posts', 'Pages', 'Staff', 'Tags']);
expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']);
// correct results are found
const options = findAll('.ember-power-select-option');
expect(options, 'number of search results').to.have.length(4);
expect(options.map(el => el.textContent.trim())).to.deep.equal(['First post', 'First page', 'First user', 'First tag']);
expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']);
// first item is selected
expect(options[0]).to.have.attribute('aria-current', 'true');