@esri/hub-common 9.41.0 → 9.41.1

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.40.0 - Fri Jun 10 2022 19:52:59 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.41.0 - Mon Jun 13 2022 14:36:13 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -13535,7 +13535,7 @@
      * @param join
      * @returns
      */
-    function mergeSearchOptions(so1, so2, join) {
+    function mergeSearchOptions$1(so1, so2, join) {
         // TODO: Remove with _searchContent
         Logger.warn("DEPRECATION: mergeSearchOptions will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
         var result = cloneObject$1(so1);
@@ -14131,12 +14131,12 @@
                 // from hitting the else
                 /* istanbul ignore else */
                 if (typeof entry === "object") {
-                    acc = mergeSearchOptions(acc, convertContentFilterToSearchOptions(entry), "OR");
+                    acc = mergeSearchOptions$1(acc, convertContentFilterToSearchOptions(entry), "OR");
                 }
                 return acc;
             }, { q: "", filter: "" });
             // merge with searchOptions using AND
-            searchOptions = mergeSearchOptions(searchOptions, subFilterOptions, "AND");
+            searchOptions = mergeSearchOptions$1(searchOptions, subFilterOptions, "AND");
         }
         // term is always last, and pre-pended on searchOptions.q
         if (filter.term) {
@@ -14164,11 +14164,11 @@
             var key = _a[0], value = _a[1];
             // MatchOptions may go into either q or filter
             if (!specialProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeMatchOptions$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
             }
             // Dates only go into q
             if (dateProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeDateRange$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
             }
         });
         return result;
@@ -14299,11 +14299,11 @@
             var key = _a[0], value = _a[1];
             // MatchOptions fields
             if (!specialProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeMatchOptions$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
             }
             // Dates only go into q
             if (dateProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeDateRange$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
             }
         });
         // searchUserAccess is also a top-level property
@@ -14439,11 +14439,11 @@
             var key = _a[0], value = _a[1];
             // MatchOptions fields
             if (!specialProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeMatchOptions$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeMatchOptions$1(key, value), "AND");
             }
             // Dates only go into q
             if (dateProps.includes(key)) {
-                result = mergeSearchOptions(result, serializeDateRange$1(key, value), "AND");
+                result = mergeSearchOptions$1(result, serializeDateRange$1(key, value), "AND");
             }
         });
         // disabled is also a top-level property
@@ -14971,7 +14971,13 @@
     function expandFilter(filter) {
         var result = {};
         var dateProps = ["created", "modified", "lastlogin"];
-        var copyProps = ["filterType", "term", "searchUserAccess", "isopendata"];
+        var copyProps = [
+            "filterType",
+            "term",
+            "searchUserAccess",
+            "isopendata",
+            "searchUserName",
+        ];
         var nonMatchOptionsFields = __spreadArrays(dateProps, copyProps);
         // Do the conversion
         Object.entries(filter).forEach(function (_a) {
@@ -15004,27 +15010,26 @@
      * @returns
      */
     function serializeFilterGroupsForPortal(filterGroups) {
-        var result = {
-            q: "",
-            filter: "",
-        };
-        result.q = filterGroups.map(serializeGroup).join(" AND ");
+        var groupSearchOptions = filterGroups.map(serializeGroup);
+        var result = mergeSearchOptions(groupSearchOptions, "AND");
         return result;
     }
     /**
      * Serialize the filters in a FitlerGroup into a Portal Query
-     * @param group
+     * @param filterGroup
      * @returns
      */
-    function serializeGroup(group) {
-        var operation = group.operation || "AND";
-        var filters = group.filters.map(expandFilter);
-        var q = filters.map(serializeFilter).join(" " + operation + " ");
-        // Wrap in parens if there is more than one filter
+    function serializeGroup(filterGroup) {
+        var operation = filterGroup.operation || "AND";
+        var filters = filterGroup.filters.map(expandFilter);
+        var filterSearchOptions = filters.map(serializeFilter);
+        // combine these searchOptions
+        var groupSearchOptions = mergeSearchOptions(filterSearchOptions, operation);
+        //
         if (filters.length > 1) {
-            q = "(" + q + ")";
+            groupSearchOptions.q = "(" + groupSearchOptions.q + ")";
         }
-        return q;
+        return groupSearchOptions;
     }
     /**
      * Serialize a Filter into a Portal Query
@@ -15034,36 +15039,64 @@
     function serializeFilter(filter) {
         var dateProps = ["created", "modified"];
         var boolProps = ["isopendata"];
+        var passThroughProps = ["searchUserAccess", "searchUserName"];
         var specialProps = __spreadArrays([
             "filterType",
-            "searchUserAccess",
             "term"
-        ], dateProps, boolProps);
+        ], dateProps, boolProps, passThroughProps);
+        var qCount = 0;
         // TODO: Look at using reduce vs .map and remove the `.filter`
-        var stringFilters = Object.entries(filter)
+        var opts = Object.entries(filter)
             .map(function (_a) {
             var key = _a[0], value = _a[1];
+            var so = { q: "" };
             if (!specialProps.includes(key)) {
-                return serializeMatchOptions(key, value);
+                qCount++;
+                so.q = serializeMatchOptions(key, value);
             }
             if (dateProps.includes(key)) {
-                return serializeDateRange(key, value);
+                qCount++;
+                so.q = serializeDateRange(key, value);
             }
             if (boolProps.includes(key)) {
-                return key + ":" + value;
+                qCount++;
+                so.q = key + ":" + value;
+            }
+            if (passThroughProps.includes(key)) {
+                so[key] = value;
             }
             if (key === "term") {
-                return value;
+                qCount++;
+                so.q = value;
             }
+            return so;
         })
             .filter(function (e) { return e !== undefined; });
-        // eslint-disable-next-line unicorn/prefer-ternary
-        if (stringFilters.length > 1) {
-            return "(" + stringFilters.join(" AND ") + ")";
-        }
-        else {
-            return stringFilters[0];
+        // merge up all the searchOptions
+        var searchOptions = mergeSearchOptions(opts, "AND");
+        if (qCount > 1) {
+            searchOptions.q = "(" + searchOptions.q + ")";
         }
+        return searchOptions;
+    }
+    function mergeSearchOptions(options, operation) {
+        var result = options.reduce(function (acc, entry) {
+            // walk the props
+            Object.entries(entry).forEach(function (_a) {
+                var key = _a[0], value = _a[1];
+                // if prop exists
+                if (acc[key]) {
+                    // combine via operation
+                    acc[key] = acc[key] + " " + operation + " " + value;
+                }
+                else {
+                    // just copy the value
+                    acc[key] = value;
+                }
+            });
+            return acc;
+        }, { q: "" });
+        return result;
     }
     /**
      * Serialize MatchOptions into portal syntax
@@ -20205,7 +20238,7 @@
     exports.mergeGroupFilters = mergeGroupFilters;
     exports.mergeMatchOptions = mergeMatchOptions;
     exports.mergeObjects = mergeObjects;
-    exports.mergeSearchOptions = mergeSearchOptions;
+    exports.mergeSearchOptions = mergeSearchOptions$1;
     exports.mergeUserFilters = mergeUserFilters;
     exports.normalizeItemType = normalizeItemType;
     exports.normalizeSolutionTemplateItem = normalizeSolutionTemplateItem;