From 8d1c1fee3e0d0d16f775bd109ab220bef8e32968 Mon Sep 17 00:00:00 2001 From: Justin DiRose Date: Thu, 9 Jul 2020 11:12:40 -0500 Subject: [PATCH] FIX: Empty solved filter was inescapable When no solved topics were found in knowledge explorer, it would render an inescapable No Topics Found message. Well now there's a proper door. --- .../controllers/knowledge-explorer.js.es6 | 22 ++++++++++++++++--- .../templates/knowledge-explorer.hbs | 6 ++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 index 827bb4f..1090764 100644 --- a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 +++ b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 @@ -51,9 +51,10 @@ export default Ember.Controller.extend({ } }, - @discourseComputed("topics", "isSearching") - emptyTopics(topics, isSearching) { - return topics.length === 0 && !isSearching ? true : false; + @discourseComputed("topics", "isSearching", "filterSolved") + emptyTopics(topics, isSearching, filterSolved) { + const filtered = isSearching || filterSolved; + return topics.length === 0 && !filtered; }, @discourseComputed("loadMoreUrl") @@ -66,6 +67,11 @@ export default Ember.Controller.extend({ return !!searchTerm; }, + @discourseComputed("isSearching", "filterSolved") + isSearchingOrFiltered(isSearching, filterSolved) { + return isSearching || filterSolved; + }, + @discourseComputed("isSearching", "model") searchCount(isSearching, model) { if (isSearching) return model.search_count; @@ -73,6 +79,16 @@ export default Ember.Controller.extend({ emptySearchResults: Ember.computed.equal("searchCount", 0), + @discourseComputed("topics") + emptyFilteredResults(topics) { + return topics.length === 0; + }, + + @discourseComputed("emptySearchResults", "emptyFilteredResults") + emptyResults(emptySearch, emptyFiltered) { + return emptySearch || emptyFiltered; + }, + @discourseComputed canFilterSolved() { return ( diff --git a/assets/javascripts/discourse/templates/knowledge-explorer.hbs b/assets/javascripts/discourse/templates/knowledge-explorer.hbs index cbf2220..d643ff5 100644 --- a/assets/javascripts/discourse/templates/knowledge-explorer.hbs +++ b/assets/javascripts/discourse/templates/knowledge-explorer.hbs @@ -59,8 +59,8 @@ {{/conditional-loading-spinner}} {{else}}
- {{#if isSearching}} - {{#if emptySearchResults}} + {{#if isSearchingOrFiltered}} + {{#if emptyResults}}
{{i18n 'search.no_results'}}
@@ -72,7 +72,7 @@
{{/if}} {{/if}} - {{#unless emptySearchResults}} + {{#unless emptyResults}} {{knowledge-explorer-topic-list topics=topics ascending=ascending