PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-20 04:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Don't display aliases when prefix is matching both alias and tag name"

Browse source 
This reverts commit 15d09cf9ba.
This commit is contained in:
KoloMl 2025-02-12 20:51:31 +04:00
parent 69a8af4044
commit 988ba6b019
3 changed files with 15 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/js/autocomplete.ts
View file

@ -8,7 +8,7 @@ import store from './utils/store';
import { TermContext } from './query/lex';
import { $$ } from './utils/dom';
import {
createLocalAutocompleteResultFormatter,
formatLocalAutocompleteResult,
fetchLocalAutocomplete,
fetchSuggestions,
SuggestionsPopup,
@ -196,11 +196,9 @@ function listenAutocomplete() {
originalTerm = `${inputField.value}`.toLowerCase();
}
const matchedTerm = trimPrefixes(originalTerm);
const suggestions = localAc
.matchPrefix(matchedTerm, suggestionsCount)
.map(createLocalAutocompleteResultFormatter(matchedTerm));
.matchPrefix(trimPrefixes(originalTerm), suggestionsCount)
.map(formatLocalAutocompleteResult);
if (suggestions.length) {
popup.renderSuggestions(suggestions).showForField(targetedInput);

44
assets/js/utils/__tests__/suggestions.spec.ts
View file

@ -2,7 +2,7 @@ import { fetchMock } from '../../../test/fetch-mock.ts';
import {
fetchLocalAutocomplete,
fetchSuggestions,
createLocalAutocompleteResultFormatter,
formatLocalAutocompleteResult,
purgeSuggestionsCache,
SuggestionsPopup,
TermSuggestion,
@ -334,13 +334,12 @@ describe('Suggestions', () => {
});
});
describe('createLocalAutocompleteResultFormatter', () => {
describe('formatLocalAutocompleteResult', () => {
it('should format suggested tags as tag name and the count', () => {
const tagName = 'safe';
const tagCount = getRandomIntBetween(5, 10);
const formatter = createLocalAutocompleteResultFormatter();
const resultObject = formatter({
const resultObject = formatLocalAutocompleteResult({
name: tagName,
aliasName: tagName,
imageCount: tagCount,
@ -355,8 +354,7 @@ describe('Suggestions', () => {
const tagAlias = 'rating:safe';
const tagCount = getRandomIntBetween(5, 10);
const formatter = createLocalAutocompleteResultFormatter();
const resultObject = formatter({
const resultObject = formatLocalAutocompleteResult({
name: tagName,
aliasName: tagAlias,
imageCount: tagCount,
@ -365,39 +363,5 @@ describe('Suggestions', () => {
expect(resultObject.label).toBe(`${tagAlias} ⇒ ${tagName} (${tagCount})`);
expect(resultObject.value).toBe(tagName);
});
it('should not display aliases when tag is starting with the same matched', () => {
const tagName = 'chest fluff';
const tagAlias = 'chest floof';
const tagCount = getRandomIntBetween(5, 10);
const prefix = 'ch';
const formatter = createLocalAutocompleteResultFormatter(prefix);
const resultObject = formatter({
name: tagName,
aliasName: tagAlias,
imageCount: tagCount,
});
expect(resultObject.label).toBe(`${tagName} (${tagCount})`);
});
it('should display aliases if matched prefix is different from the tag name', () => {
const tagName = 'queen chrysalis';
const tagAlias = 'chrysalis';
const tagCount = getRandomIntBetween(5, 10);
const prefix = 'ch';
const formatter = createLocalAutocompleteResultFormatter(prefix);
const resultObject = formatter({
name: tagName,
aliasName: tagAlias,
imageCount: tagCount,
});
expect(resultObject.label).toBe(`${tagAlias} ⇒ ${tagName} (${tagCount})`);
});
});
});

18
assets/js/utils/suggestions.ts
View file

@ -176,17 +176,15 @@ export async function fetchLocalAutocomplete(): Promise<LocalAutocompleter> {
.then(buf => new LocalAutocompleter(buf));
}
export function createLocalAutocompleteResultFormatter(matchedPrefix?: string): (result: Result) => TermSuggestion {
return result => {
let tagName = result.name;
export function formatLocalAutocompleteResult(result: Result): TermSuggestion {
let tagName = result.name;
if (tagName !== result.aliasName && (!matchedPrefix || !tagName.startsWith(matchedPrefix))) {
tagName = `${result.aliasName} ⇒ ${tagName}`;
}
if (tagName !== result.aliasName) {
tagName = `${result.aliasName} ⇒ ${tagName}`;
}
return {
value: result.name,
label: `${tagName} (${result.imageCount})`,
};
return {
value: result.name,
label: `${tagName} (${result.imageCount})`,
};
}