From 9e3d90896b8316dd0385d18a9d6cb30c7617617e Mon Sep 17 00:00:00 2001
From: gconsidine <greg@gregconsidine.com>
Date: Tue, 10 Oct 2017 15:22:17 -0400
Subject: [PATCH] Remove unsupported tokens from search generated queries

---
 .../shared/smart-search/queryset.service.js   | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

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 1571ab936d..27681d18b4 100644
--- a/awx/ui/client/src/shared/smart-search/queryset.service.js
+++ b/awx/ui/client/src/shared/smart-search/queryset.service.js
@@ -29,43 +29,48 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
                 return defer.promise;
             },
 
+            replaceDefaultFlags (value) {
+                value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains");
+                value = value.toString().replace(/__search_DEFAULT/g, "__search");
+
+                return value;
+            },
+
+            replaceEncodedTokens(value) {
+                return decodeURIComponent(value).replace(/"|'/g, "");
+            },
+
+            encodeTerms (values, key) {
+                key = this.replaceDefaultFlags(key);
+
+                if (!Array.isArray(values)) {
+                    values = this.replaceEncodedTokens(values);
+
+                    return `${key}=${values}`;
+                }
+
+                return values
+                    .map(value => {
+                        value = this.replaceDefaultFlags(value);
+                        value = this.replaceEncodedTokens(value);
+
+                        return `${key}=${value}`;
+                    })
+                    .join('&');
+            },
             // encodes ui-router params from {operand__key__comparator: value} pairs to API-consumable URL
             encodeQueryset(params) {
-                let queryset;
-                queryset = _.reduce(params, (result, value, key) => {
-                    return result + encodeTerm(value, key);
-                }, '');
-                queryset = queryset.substring(0, queryset.length - 1);
-                return angular.isObject(params) ? `?${queryset}` : '';
-
-                function encodeTerm(value, key){
-
-                    key = key.toString().replace(/__icontains_DEFAULT/g, "__icontains");
-                    key = key.toString().replace(/__search_DEFAULT/g, "__search");
-
-                    value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains");
-                    value = value.toString().replace(/__search_DEFAULT/g, "__search");
-
-                    if (Array.isArray(value)){
-                        value = _.uniq(_.flattenDeep(value));
-                        let concated = '';
-                        angular.forEach(value, function(item){
-                            if(item && typeof item === 'string') {
-                                item = decodeURIComponent(item).replace(/"|'/g, "");
-                            }
-                            concated += `${key}=${item}&`;
-                        });
-
-                        return concated;
-                    }
-                    else {
-                        if(value && typeof value === 'string') {
-                            value = decodeURIComponent(value).replace(/"|'/g, "");
-                        }
-
-                        return `${key}=${value}&`;
-                    }
+                if (typeof params !== 'object') {
+                    return '';
                 }
+
+                return _.reduce(params, (result, value, key) => {
+                    if (result !== '?') {
+                        result += '&';
+                    }
+
+                    return result += this.encodeTerms(value, key);
+                }, '?');
             },
             // encodes a ui smart-search param to a django-friendly param
             // operand:key:comparator:value => {operand__key__comparator: value}