TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 04:13:30 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed searching posts in member filters (#19505)

Browse Source 
fixes PROD-201

The issue was caused because we were searching the 'name' field instead of the 'title' field.

This also increases the performance when loading the posts:
- Makes sure no relations are loaded
- Only return the fields we actually need
- Stop using limit=all, and replaced it with network based search
This commit is contained in:
Simon Backx 2024-01-17 17:06:06 +01:00 committed by GitHub
parent 5ddd90a244
commit f3c1366406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ghost/admin/app/components/gh-resource-select.js
View File

@ -6,9 +6,18 @@ import {
filterOptions
} from 'ember-power-select/utils/group-utils';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const DEBOUNCE_MS = 200;
function mapResource(resource) {
return {
id: resource.id,
title: resource.title
};
}
export default class GhResourceSelect extends Component {
@service store;
@ -19,7 +28,7 @@ export default class GhResourceSelect extends Component {
}
get searchField() {
return this.args.searchField === undefined ? 'name' : this.args.searchField;
return this.args.searchField === undefined ? 'title' : this.args.searchField;
}
@action
@ -40,6 +49,11 @@ export default class GhResourceSelect extends Component {
newOptions = this._filter(A(newOptions), term);
if (newOptions.length === 0) {
// Do a query lookup
newOptions = yield this.fetchOptionsForSearchTask.perform(term);
}
return newOptions;
}
@ -114,21 +128,14 @@ export default class GhResourceSelect extends Component {
const options = yield [];
if (this.args.type === 'email') {
const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null', limit: 'all'});
const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null', limit: '25', fields: 'id,title'});
options.push(...posts.map(mapResource));
this._options = options;
return;
}
const posts = yield this.store.query('post', {filter: 'status:published', limit: 'all'});
const pages = yield this.store.query('page', {filter: 'status:published', limit: 'all'});
function mapResource(resource) {
return {
id: resource.id,
title: resource.title
};
}
const posts = yield this.store.query('post', {filter: 'status:published', limit: '25', fields: 'id,title'});
const pages = yield this.store.query('page', {filter: 'status:published', limit: '25', fields: 'id,title'});
if (posts.length > 0) {
options.push({
@ -146,4 +153,31 @@ export default class GhResourceSelect extends Component {
this._options = options;
}
@task({restartable: true})
*fetchOptionsForSearchTask(searchTerm) {
// Debounce
yield timeout(DEBOUNCE_MS);
const options = yield [];
if (this.args.type === 'email') {
const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
options.push(...posts.map(mapResource));
return options;
}
const posts = yield this.store.query('post', {filter: 'status:published+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
const pages = yield this.store.query('page', {filter: 'status:published+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
if (posts.length > 0) {
options.push(...posts.map(mapResource));
}
if (pages.length > 0) {
options.push(...pages.map(mapResource));
}
return options;
}
}