From e58e5931403c05f8c2315e36dea5952b415ebf1d Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 19 Apr 2017 16:59:54 -0400
Subject: [PATCH] First pass implementation of fact searching on hosts

---
 .../client/src/inventories/hosts/host.list.js |  4 ++++
 .../list-generator/list-generator.factory.js  |  4 ++++
 .../shared/smart-search/queryset.service.js   | 20 +++++++++++++++++--
 .../smart-search/smart-search.controller.js   | 16 ++++++++-------
 .../smart-search/smart-search.directive.js    |  4 +++-
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/awx/ui/client/src/inventories/hosts/host.list.js b/awx/ui/client/src/inventories/hosts/host.list.js
index 34d5056d42..8118431df5 100644
--- a/awx/ui/client/src/inventories/hosts/host.list.js
+++ b/awx/ui/client/src/inventories/hosts/host.list.js
@@ -10,6 +10,10 @@ export default ['i18n', function(i18n) {
         iterator: 'host',
         editTitle: '{{ selected_group }}',
         searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12',
+        nonstandardSearchParam: {
+            root: 'ansible_facts',
+            param: 'host_filter'
+        },
         showTitle: false,
         well: true,
         index: false,
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 78eb66f5b7..dea1d2383c 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -198,11 +198,15 @@ export default ['$compile', 'Attr', 'Icon',
                     list.searchSize = 'col-lg-7 col-md-12 col-sm-12 col-xs-12';
                 }
                 if (options.showSearch === undefined || options.showSearch === true) {
+                    let nonstandardSearchParam = list.nonstandardSearchParam && list.nonstandardSearchParam.param ? list.nonstandardSearchParam.param : undefined;
+                    let nonstandardSearchParamRoot = list.nonstandardSearchParam && list.nonstandardSearchParam.root ? list.nonstandardSearchParam.root : undefined;
                     html += `
                     <div ng-hide="${list.name}.length === 0 && (searchTags | isEmpty)">
                         <smart-search
                             django-model="${list.name}"
                             search-size="${list.searchSize}"
+                            nonstandard-search-param="${nonstandardSearchParam}"
+                            nonstandard-search-param-root="${nonstandardSearchParamRoot}"
                             base-path="${list.basePath || list.name}"
                             iterator="${list.iterator}"
                             dataset="${list.iterator}_dataset"
diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js
index f647b48dd4..dd5e038f8d 100644
--- a/awx/ui/client/src/shared/smart-search/queryset.service.js
+++ b/awx/ui/client/src/shared/smart-search/queryset.service.js
@@ -57,6 +57,8 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
 
                 function encodeTerm(value, key){
 
+                    let root = key.split("__")[0].replace(/^-/, '');
+
                     key = key.replace(/__icontains_DEFAULT/g, "__icontains");
                     key = key.replace(/__search_DEFAULT/g, "__search");
 
@@ -69,13 +71,27 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
                             }
                             concated += `${key}=${item}&`;
                         });
-                        return concated;
+
+                        if(root === 'ansible_facts') {
+                            return `host_filter=${encodeURIComponent(concated)}&`;
+                        }
+                        else {
+                            return concated;
+                        }
                     }
                     else {
                         if(value && typeof value === 'string') {
                             value = decodeURIComponent(value).replace(/"|'/g, "");
                         }
-                        return `${key}=${value}&`;
+
+                        if(root === 'ansible_facts') {
+                            let foobar = encodeURIComponent(`${key}=${value}`);
+                            return `host_filter=${foobar}&`;
+                        }
+                        else {
+                            return `${key}=${value}&`;
+                        }
+
                     }
                 }
             },
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index a6211f2e56..a54ceeeebf 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -87,13 +87,9 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
         }
 
         function setDefaults(term) {
-            if ($scope.list.defaultSearchParams) {
-                return $scope.list.defaultSearchParams(encodeURIComponent(term));
-            } else {
-               return {
-                    search: encodeURIComponent(term)
-                };
-            }
+           return {
+                search: encodeURIComponent(term)
+            };
         }
 
         $scope.toggleKeyPane = function() {
@@ -160,6 +156,9 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
                         encodeParams.relatedSearchTerm = true;
                         removed = qs.encodeParam(encodeParams);
                     }
+                    else if($scope.nonstandardSearchParam && $scope.nonstandardSearchParamRoot && root === $scope.nonstandardSearchParamRoot) {
+                        removed = qs.encodeParam(encodeParams);
+                    }
                     else {
                         removed = setDefaults(termParts[termParts.length-1]);
                     }
@@ -236,6 +235,9 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
                         else if(_.contains($scope.models[$scope.list.name].related, root)) {
                             params = _.merge(params, qs.encodeParam({term: term, relatedSearchTerm: true}), combineSameSearches);
                         }
+                        else if($scope.nonstandardSearchParam && $scope.nonstandardSearchParamRoot && root === $scope.nonstandardSearchParamRoot) {
+                            params = _.merge(params, qs.encodeParam({term: term, searchTerm: true}), combineSameSearches);
+                        }
                         // Its not a search term or a related search term - treat it as a string
                         else {
                             params = _.merge(params, setDefaults(term), combineSameSearches);
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.directive.js b/awx/ui/client/src/shared/smart-search/smart-search.directive.js
index 180914dc1e..193d772ed7 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.directive.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.directive.js
@@ -17,7 +17,9 @@ export default ['templateUrl',
                 searchTags: '=',
                 disableSearch: '=',
                 defaultParams: '=',
-                querySet: '='
+                querySet: '=',
+                nonstandardSearchParam: '@',
+                nonstandardSearchParamRoot: '@'
             },
             controller: 'SmartSearchController',
             templateUrl: templateUrl('shared/smart-search/smart-search')