feat(search): ✨ reimplement multi search command experiment

Search commands start withs slash and includes: action, rest, ask
StarCitizenTools · Aug 3, 2023 · eec5c6f · eec5c6f
1 parent 4241f85
commit eec5c6f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/resources/skins.citizen.search/searchClient.js b/resources/skins.citizen.search/searchClient.js
@@ -3,13 +3,13 @@ const searchClientsData = require( './searchClients/searchClients.json' );
 function searchClient( config ) {
 	return {
 		active: null,
-		getData: function ( id ) {
-			const data = Object.values( searchClientsData ).find( ( item ) => item.id === id );
+		getData: function ( key, value ) {
+			const data = Object.values( searchClientsData ).find( ( item ) => item[ key ] === value );
 			return data;
 		},
 		setActive: function ( id ) {
-			const data = this.getData( id );
-			if ( data ) {
+			const data = this.getData( 'id', id );
+			if ( data && data !== this.active ) {
 				const client = require( `./searchClients/${data.id}.js` );
 				this.active = data;
 				this.active.client = client( config );

diff --git a/resources/skins.citizen.search/searchClients/smwAskApi.js b/resources/skins.citizen.search/searchClients/smwAskApi.js
@@ -67,7 +67,7 @@ function adaptApiResponse( config, query, response, showDescription ) {
 					height: 200
 				} : undefined
 			};
-		} )
+		} ) ?? []
 	};
 }
 

diff --git a/resources/skins.citizen.search/searchQuery.js b/resources/skins.citizen.search/searchQuery.js
@@ -10,6 +10,9 @@ function searchQuery() {
 		},
 		checkValid: function ( s ) {
 			return s.length > 0;
+		},
+		removeCommand: function ( s ) {
+			this.setValue( this.value.replace( `/${s} `, '' ) );
 		}
 	};
 }

diff --git a/resources/skins.citizen.search/typeahead.js b/resources/skins.citizen.search/typeahead.js
@@ -357,6 +357,20 @@ function getMenuItem( data ) {
  */
 function updateTypeahead() {
 	searchQuery.setValue( searchInput.value );
+	searchClient.setActive( config.wgCitizenSearchGateway );
+
+	// Search command experiement
+	if ( searchInput.value.startsWith( '/' ) ) {
+		const command = searchInput.value.split( ' ' )[ 0 ].slice( 1 );
+		if ( command.length > 0 ) {
+			const searchClientData = searchClient.getData( 'command', command );
+			// Multi-search clients experiment
+			if ( searchClientData ) {
+				searchClient.setActive( searchClientData.id );
+				searchQuery.removeCommand( command );
+			}
+		}
+	}
 
 	const placeholder = typeahead.querySelector( `.${ITEM_CLASS}-placeholder` );
 
@@ -491,8 +505,6 @@ function initTypeahead( searchForm, input ) {
 
 	// Init the value in case of undef error
 	updateActiveIndex();
-	// Set default active search client
-	searchClient.setActive( config.wgCitizenSearchGateway );
 
 	// Since searchInput is focused before the event listener is set up
 	onFocus();

diff --git a/skin.json b/skin.json
@@ -163,7 +163,8 @@
 				"resources/skins.citizen.search/urlGenerator.js",
 				"resources/skins.citizen.search/searchClients/searchClients.json",
 				"resources/skins.citizen.search/searchClients/mwActionApi.js",
-				"resources/skins.citizen.search/searchClients/mwRestApi.js"
+				"resources/skins.citizen.search/searchClients/mwRestApi.js",
+				"resources/skins.citizen.search/searchClients/smwAskApi.js"
 			],
 			"messages": [
 				"citizen-search-fulltext",