0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-22 09:20:29 +01:00

Merge pull request #81 from paviliondev/similar-topics-impr

IMPR: added a state for insufficient characters
Dieser Commit ist enthalten in:
Angus McLeod 2021-03-25 19:11:55 +11:00 committet von GitHub
Commit 87675c1bfa
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 21 neuen und 21 gelöschten Zeilen

Datei anzeigen

@ -18,9 +18,6 @@ export default WizardFieldValidator.extend({
noSimilarTopics: computed('similarTopics', function() { noSimilarTopics: computed('similarTopics', function() {
return this.similarTopics !== null && this.similarTopics.length == 0; return this.similarTopics !== null && this.similarTopics.length == 0;
}), }),
showDefault: computed('hasNotSearched', 'hasInput', 'typing', function() {
return this.hasInput && (this.hasNotSearched || this.typing);
}),
showSimilarTopics: computed('typing', 'hasSimilarTopics', function() { showSimilarTopics: computed('typing', 'hasSimilarTopics', function() {
return this.hasSimilarTopics && !this.typing; return this.hasSimilarTopics && !this.typing;
}), }),
@ -28,7 +25,10 @@ export default WizardFieldValidator.extend({
return this.noSimilarTopics && !this.typing; return this.noSimilarTopics && !this.typing;
}), }),
hasValidationCategories: notEmpty('validationCategories'), hasValidationCategories: notEmpty('validationCategories'),
showValidationCategories: and('showDefault', 'hasValidationCategories'), insufficientCharacters: computed('typing', 'field.value', function() {
return this.hasInput && this.field.value.length < 5 && !this.typing;
}),
insufficientCharactersCategories: and('insufficientCharacters', 'hasValidationCategories'),
@discourseComputed('validation.categories') @discourseComputed('validation.categories')
validationCategories(categoryIds) { validationCategories(categoryIds) {
@ -46,15 +46,15 @@ export default WizardFieldValidator.extend({
'loading', 'loading',
'showSimilarTopics', 'showSimilarTopics',
'showNoSimilarTopics', 'showNoSimilarTopics',
'showValidationCategories', 'insufficientCharacters',
'showDefault' 'insufficientCharactersCategories'
) )
currentState( currentState(
loading, loading,
showSimilarTopics, showSimilarTopics,
showNoSimilarTopics, showNoSimilarTopics,
showValidationCategories, insufficientCharacters,
showDefault insufficientCharactersCategories
) { ) {
switch (true) { switch (true) {
case loading: case loading:
@ -63,10 +63,10 @@ export default WizardFieldValidator.extend({
return 'results'; return 'results';
case showNoSimilarTopics: case showNoSimilarTopics:
return 'no_results'; return 'no_results';
case showValidationCategories: case insufficientCharactersCategories:
return 'default_categories'; return 'insufficient_characters_categories';
case showDefault: case insufficientCharacters:
return 'default'; return 'insufficient_characters';
default: default:
return false; return false;
} }
@ -97,11 +97,6 @@ export default WizardFieldValidator.extend({
this.set("typing", true); this.set("typing", true);
if (value && value.length < 5) {
this.set('similarTopics', null);
return;
}
const lastKeyUp = new Date(); const lastKeyUp = new Date();
this._lastKeyUp = lastKeyUp; this._lastKeyUp = lastKeyUp;
@ -113,7 +108,12 @@ export default WizardFieldValidator.extend({
return; return;
} }
this.set("typing", false); this.set("typing", false);
if (value && value.length < 5) {
this.set('similarTopics', null);
return;
}
this.updateSimilarTopics(); this.updateSimilarTopics();
}, 1000); }, 1000);
}, },

Datei anzeigen

@ -1,6 +1,6 @@
<label class={{currentStateClass}}> <label class={{currentStateClass}}>
{{#if currentState}} {{#if currentState}}
{{#if showValidationCategories}} {{#if insufficientCharactersCategories}}
{{html-safe (i18n currentStateKey catLinks=catLinks)}} {{html-safe (i18n currentStateKey catLinks=catLinks)}}
{{else}} {{else}}
{{i18n currentStateKey}} {{i18n currentStateKey}}

Datei anzeigen

@ -528,8 +528,8 @@ en:
realtime_validations: realtime_validations:
similar_topics: similar_topics:
default: "When you stop typing we'll look for similar topics." insufficient_characters: "Type a minimum 5 characters to start looking for similar topics"
default_categories: "When you stop typing we'll look for similar topics in %{catLinks}" insufficient_characters_categories: "Type a minimum 5 characters to start looking for similar topics in %{catLinks}"
results: "Your topic is similar to..." results: "Your topic is similar to..."
no_results: "No similar topics." no_results: "No similar topics."
loading: "Looking for similar topics..." loading: "Looking for similar topics..."