Fixes #1005 (#1035)

* Fixes #1005

* lint

Author: epugh

app/assets/javascripts/controllers/wizardModal.js

@@ -68,8 +68,26 @@ angular.module('QuepidApp')
         if (angular.isUndefined($scope.pendingWizardSettings)){
              // When we run the case wizard, we assume that you want to use our Solr based TMDB demo setup.
              // We then give you options to change from there.
-             $scope.pendingWizardSettings = angular.copy(settingsSvc.tmdbSettings['solr']);
+             
+             // If we are reloading, then use the new one we picked, otherwise
+             // we default to Solr.
+             let searchEngineToUse = null;
+             if (angular.isDefined($location.search().searchEngine)){
+               searchEngineToUse = $location.search().searchEngine;
+             }
+             else {
+               searchEngineToUse = 'solr';
+             }
+             $scope.pendingWizardSettings = {
+               searchEngine: searchEngineToUse
+             };
+             
+             // Helps us distingush if we are using tmdb demo setup or no
+             if (angular.isDefined($location.search().searchUrl)){
+               $scope.pendingWizardSettings.searchUrl = $location.search().searchUrl;
+             }
         }
+        
         var settings = settingsSvc.pickSettingsToUse($scope.pendingWizardSettings.searchEngine, $scope.pendingWizardSettings.searchUrl);
         $scope.pendingWizardSettings.additionalFields         = settings.additionalFields;
         $scope.pendingWizardSettings.fieldSpec                = settings.fieldSpec;
@@ -86,7 +104,6 @@ angular.module('QuepidApp')
         $scope.pendingWizardSettings.basicAuthCredential      = settings.basicAuthCredential;
         $scope.pendingWizardSettings.mapperCode               = settings.mapperCode;
 
-        //$scope.isHeaderConfigCollapsed = true;
 
         var quepidStartsWithHttps = $location.protocol() === 'https';
 
@@ -132,7 +149,7 @@ angular.module('QuepidApp')
         $scope.pendingWizardSettings.searchUrl                = searchEndpointToUse.endpointUrl; // notice remapping
         $scope.pendingWizardSettings.apiMethod                = searchEndpointToUse.apiMethod;
         $scope.pendingWizardSettings.customHeaders            = searchEndpointToUse.customHeaders;
-        
+
         // Now grab default settings for the type of search endpoint you are using
         var settings = settingsSvc.pickSettingsToUse($scope.pendingWizardSettings.searchEngine, $scope.pendingWizardSettings.searchUrl);         
         $scope.pendingWizardSettings.additionalFields         = settings.additionalFields;

app/assets/javascripts/services/settingsSvc.js

@@ -76,8 +76,7 @@ angular.module('QuepidApp')
             '  "query": {',
             '    "multi_match": {',
             '      "query": "#$query##",',
-            '      "type": "best_fields",',
-            '      "fields": ["REPLACE_ME"]',
+            '      "fields": ["*"]',
             '    }',
             '  }',
             '}',

app/assets/templates/views/wizardModal.html

@@ -81,8 +81,8 @@ <h2>What Search Endpoint do you want to connect to?</h2>
             <div ng-show="showTLSChangeWarning" class="alert alert-warning">
               <span>
               You have specified a search endpoint url that is on a different protocol ( <code>{{protocolToSwitchTo}}</code> ) than Quepid is running,
-              and this triggers your browser to prevent communciation with the search endpoint.  Option 1: Reload Quepid to run on the correct protocol
-              or Option 2: Proxy the requests THROUGH the Quepid server.
+              and this triggers your browser to prevent communciation with the search endpoint.  <br/>Option 1: Reload Quepid to run on the correct protocol
+              <br/>Option 2: Proxy the requests THROUGH the Quepid server.
               </span>
             </div>
             <div ng-show="invalidProxyApiMethod" class="alert alert-danger">
@@ -401,8 +401,8 @@ <h2>CSV</h2>
             <div ng-show="showTLSChangeWarning" class="alert alert-warning">
               <span>
               You have specified a search endpoint url that is on a different protocol ( <code>{{protocolToSwitchTo}}</code> ) than Quepid is running,
-              and this triggers your browser to prevent communciation with the search endpoint.  Option 1: Reload Quepid to run on the correct protocol
-              or Option 2: Proxy the requests THROUGH the Quepid server.
+              and this triggers your browser to prevent communciation with the search endpoint.  <br/>Option 1: Reload Quepid to run on the correct protocol
+              <br/>Option 2: Proxy the requests THROUGH the Quepid server.
               </span>
             </div>
             <div class="row" style="margin-top: 50px;">