Search error:
- {{errorMsg}}
Nothing was found.
-
-
`,
mounted() {
+
+ // handle requests to do a search
gEventBus.on( "search", this.onSearch ) ;
+
+ // update after search result filtering has been changed
+ gEventBus.on( "sr-filtered", (nVisible, nTotal) => {
+ if ( nTotal == 0 )
+ this.noResultsMsg = "Nothing was found." ;
+ else if ( nVisible == 0 )
+ this.noResultsMsg = "All search results have been filtered." ;
+ else
+ this.noResultsMsg = null ;
+ } ) ;
+
},
methods: {
@@ -83,9 +203,10 @@ gMainApp.component( "search-results", {
// initialize
this.errorMsg = null ;
+ this.noResultsMsg = null ;
hideFootnotes() ;
- function onSearchDone() {
- Vue.nextTick( () => { gEventBus.emit( "search-done" ) ; } ) ;
+ function onSearchDone( showSrCount ) {
+ Vue.nextTick( () => { gEventBus.emit( "search-done", showSrCount ) ; } ) ;
}
// check if the query string is just a ruleid
@@ -94,14 +215,14 @@ gMainApp.component( "search-results", {
// yup - just show it directly (first one, if multiple)
this.searchResults = null ;
gEventBus.emit( "show-target", targets[0].cdoc_id, targets[0].ruleid ) ;
- onSearchDone() ;
+ onSearchDone( false ) ;
return ;
}
// submit the search request
const onError = (errorMsg) => {
this.errorMsg = errorMsg ;
- onSearchDone() ;
+ onSearchDone( true ) ;
} ;
postURL( gSearchUrl, //eslint-disable-line no-undef
{ queryString: queryString }
@@ -123,7 +244,7 @@ gMainApp.component( "search-results", {
gEventBus.emit( "show-target", target.cdoc_id, target.ruleid ) ;
}
// flag that the search was completed
- onSearchDone() ;
+ onSearchDone( true ) ;
} ).catch( (errorMsg) => {
onError( errorMsg ) ;
} ) ;
@@ -136,7 +257,7 @@ gMainApp.component( "search-results", {
if ( sr[key] !== undefined )
sr[key] = fixupSearchHilites( sr[key] ) ;
} ) ;
- } else if ( sr.sr_type == "q+a" ) {
+ } else if ( sr.sr_type == "qa" ) {
if ( ! sr.content )
return ;
sr.content.forEach( (content) => {
@@ -156,6 +277,15 @@ gMainApp.component( "search-results", {
console.log( "INTERNAL ERROR: Unknown search result type:", sr.sr_type ) ;
}
},
+
+ showSr( srType ) {
+ // figure out if a search result should start off hidden or visible
+ let name = "show-" + srType + "-sr" ;
+ let $elem = $( "#search-box input[type='checkbox'][name='" + name + "']" ) ;
+ let state = $elem.prop( "checked" ) ;
+ return state ;
+ },
+
},
} ) ;
diff --git a/asl_rulebook2/webapp/static/SearchResult.js b/asl_rulebook2/webapp/static/SearchResult.js
index 50a9a3d..731d548 100644
--- a/asl_rulebook2/webapp/static/SearchResult.js
+++ b/asl_rulebook2/webapp/static/SearchResult.js
@@ -13,7 +13,7 @@ gMainApp.component( "index-sr", {
} ; },
template: `
- ???:{{sr.sr_type}}
+
+
{{noResultsMsg}}
+
+
???:{{sr.sr_type}}
+