Merge pull request ngageoint#569 in WV/opensphere from ~ROTHM/opensph…

…ere:THIN-12435 to master

* commit 'cc7866fd35d5d2bf82fd8962812ee539e3f19364':
  feat(search): attribute to track search providers that will send search terms to an external site

src/os/search/abstractsearch.js

@@ -65,6 +65,13 @@ os.search.AbstractSearch = function(id, name, opt_type, opt_priority, opt_defaul
    */
   this.term = null;
 
+  /**
+   * Is the search provider external?
+   * @type {boolean}
+   * @private
+   */
+  this.isExternal_ = false;
+
   /**
    * The logger used by the search provider.
    * @type {goog.log.Logger}
@@ -186,6 +193,22 @@ os.search.AbstractSearch.prototype.autocomplete = goog.abstractMethod;
 os.search.AbstractSearch.prototype.searchTerm = goog.abstractMethod;
 
 
+/**
+ * @inheritDoc
+ */
+os.search.AbstractSearch.prototype.isExternal = function() {
+  return this.isExternal_;
+};
+
+
+/**
+ * @inheritDoc
+ */
+os.search.AbstractSearch.prototype.setExternal = function(external) {
+  this.isExternal_ = external;
+};
+
+
 /**
  * DEPRECATED
  * @param {string} term

src/os/search/abstractsearchmanager.js

@@ -2,6 +2,7 @@ goog.provide('os.search.AbstractSearchManager');
 
 goog.require('goog.events.Event');
 goog.require('goog.events.EventTarget');
+goog.require('os.user.settings.FavoriteManager');
 
 
 
@@ -242,6 +243,7 @@ os.search.AbstractSearchManager.prototype.getTotal = goog.abstractMethod;
 
 /**
  * Retrieve the identifying names of all the registered searches.
+ * @param {boolean=} opt_excludeExternal
  * @return {!Array<!os.search.ISearch>}
  */
 os.search.AbstractSearchManager.prototype.getRegisteredSearches = goog.abstractMethod;

src/os/search/isearch.js

@@ -97,3 +97,17 @@ os.search.ISearch.prototype.supportsSearchTerm;
  * @return {boolean}
  */
 os.search.ISearch.prototype.shouldNormalize;
+
+
+/**
+ * Whether the search is sent to external search providers.
+ * @return {boolean} [description]
+ */
+os.search.ISearch.prototype.isExternal;
+
+
+/**
+ * Set if the search is external
+ * @param {boolean} external
+ */
+os.search.ISearch.prototype.setExternal;

src/os/search/searchmanager.js

@@ -34,10 +34,9 @@ os.search.ProviderResults;
  * Responsible for executing search terms against the registered searches
  * @extends {os.search.AbstractSearchManager}
  * @param {string=} opt_id
- * @param {boolean=} opt_isFederated
  * @constructor
  */
-os.search.SearchManager = function(opt_id, opt_isFederated) {
+os.search.SearchManager = function(opt_id) {
   os.search.SearchManager.base(this, 'constructor', opt_id);
 
   /**
@@ -76,12 +75,6 @@ os.search.SearchManager = function(opt_id, opt_isFederated) {
    * @private
    */
   this.total_ = 0;
-
-  /**
-   * @type {boolean}
-   * @private
-   */
-  this.isFederated_ = !!opt_isFederated;
 };
 goog.inherits(os.search.SearchManager, os.search.AbstractSearchManager);
 goog.addSingletonGetter(os.search.SearchManager);
@@ -145,8 +138,10 @@ os.search.SearchManager.prototype.registerSearch = function(search) {
 /**
  * @inheritDoc
  */
-os.search.SearchManager.prototype.getRegisteredSearches = function() {
-  return goog.object.getValues(this.registeredSearches_);
+os.search.SearchManager.prototype.getRegisteredSearches = function(opt_excludeExternal) {
+  return goog.object.getValues(this.registeredSearches_).filter(function(search) {
+    return (!opt_excludeExternal || !search.isExternal());
+  });
 };
 
 
@@ -421,7 +416,7 @@ os.search.SearchManager.prototype.getTotal = function() {
  * @export
  */
 os.search.SearchManager.prototype.isFederated = function() {
-  return this.isFederated_;
+  return !this.getRegisteredSearches(true).length;
 };