@esri/hub-common 9.45.3 → 9.45.6

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.45.2 - Thu Jun 30 2022 13:33:18 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.45.5 - Thu Jul 07 2022 20:50:46 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -15006,140 +15006,6 @@
         }
     }
 
-    /**
-     * Generic Hub Error with an Error stack as well
-     * as an optional serialized OperationStack.
-     *
-     * Also accepts a `rootCause` Error object
-     */
-    var HubError = /** @class */ (function (_super) {
-        __extends(HubError, _super);
-        /**
-         * Creates an instance of HubError.
-         * @param {string} operation
-         * @param {string} [message]
-         * @param {Error} [rootCause]
-         * @memberof HubError
-         */
-        function HubError(operation, message, rootCause) {
-            var _this = this;
-            message = message || "UNKNOWN_ERROR";
-            // if the rootCause has a .rootCause, use that so we don't deeply nest
-            rootCause = getWithDefault$1(rootCause, "rootCause", rootCause);
-            /* Skip coverage on super(...) as per:
-               https://github.com/Microsoft/TypeScript/issues/13029
-               https://github.com/SitePen/remap-istanbul/issues/106
-            */
-            /* istanbul ignore next */
-            _this = _super.call(this, operation, message, rootCause) || this;
-            _this.name = "HubError";
-            // if the original error has a stack use it, otherwise create a new
-            // stack. Note: a new Stack will make it look like the error origninated
-            // in the HubError constructor. This is only an issue in tests but
-            // it can be confusing to debug
-            _this.stack = getWithDefault$1(rootCause, "stack", new Error().stack);
-            return _this;
-        }
-        return HubError;
-    }(OperationError$1));
-    var HubError$1 = HubError;
-
-    /**
-     * Generic search that returns Hub Entity types converted from items
-     * by the passed in `ItemToEntityFunction`
-     *
-     * This abstraction is used to ensure that searching from any of the
-     * entity managers / modules is consistent, and returns the entity
-     * types, instead of `IItem` or `IHubContent`
-     *
-     * @param filter
-     * @param convertFn
-     * @param options
-     * @returns
-     */
-    function searchContentEntities(filter, convertFn, options) {
-        var _a, _b;
-        // expand filter so we can serialize to either api
-        var expanded = expandContentFilter(filter);
-        var searchOptions = serializeContentFilterForPortal(expanded);
-        // DEPRECATION
-        /* istanbul ignore next */
-        if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
-            // tslint:disable-next-line:no-console
-            console.warn("IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.");
-            searchOptions.countFields = options.aggregations.join(",");
-            searchOptions.countSize = options.aggLimit || 10;
-        }
-        // Aggregations
-        if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
-            searchOptions.countFields = options.aggFields.join(",");
-            searchOptions.countSize = options.aggLimit || 10;
-        }
-        // properties to copy from IHubSearchOptions to the ISearchOptions
-        var props = [
-            "authentication",
-            "num",
-            "sortField",
-            "sortOrder",
-            "site",
-            "start",
-        ];
-        // Include "start" here
-        // copy the props over
-        props.forEach(function (prop) {
-            if (options.hasOwnProperty(prop)) {
-                searchOptions[prop] = options[prop];
-            }
-        });
-        // create the entitySearchFn
-        var searchFn = createContentEntitySearchFn(convertFn);
-        // execute the search
-        // Add ArcGIS API
-        if (options.api && !options.authentication) {
-            var expandedApi = expandApi(options.api);
-            searchOptions.portal = expandedApi.url;
-        }
-        return searchFn(searchOptions);
-    }
-    /**
-     * Return a function that holds a closure containing
-     * a hub entity specific conversion function. This
-     * allows the `.next()` function to use the function on
-     * subsequent calls
-     * @param convertFn
-     * @returns
-     */
-    function createContentEntitySearchFn(convertFn) {
-        // Return a function that does the search, with a closure over the
-        // conversion function. Naming this function is important as it's
-        // referenced in the `next` section below
-        return function searchEntities(searchOptions) {
-            return __awaiter(this, void 0, void 0, function () {
-                var response, entities, facets;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, searchItems(searchOptions)];
-                        case 1:
-                            response = _a.sent();
-                            return [4 /*yield*/, Promise.all(response.results.map(function (itm) {
-                                    return convertFn(itm, searchOptions);
-                                }))];
-                        case 2:
-                            entities = _a.sent();
-                            facets = convertPortalResponseToFacets(response);
-                            return [2 /*return*/, {
-                                    total: response.total,
-                                    results: entities,
-                                    facets: facets,
-                                    hasNext: response.nextStart > -1,
-                                    next: getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
-                                }];
-                    }
-                });
-            });
-        };
-    }
-
     function expandPredicate(predicate) {
         var result = {};
         var dateProps = ["created", "modified", "lastlogin"];
@@ -15175,24 +15041,42 @@
         });
         return result;
     }
+
+    /**
+     * Serialize IQuery into ISearchOptions for ArcGIS Portal
+     * @param query
+     * @returns
+     */
     function serializeQueryForPortal(query) {
         var filterSearchOptions = query.filters.map(serializeFilter);
-        var result = mergeSearchOptions(filterSearchOptions, "AND");
+        // remove any empty entries
+        var nonEmptyOptions = filterSearchOptions.filter(removeEmptyEntries);
+        var result = mergeSearchOptions(nonEmptyOptions, "AND");
         return result;
     }
+    /**
+     * Predicate to remove things from array
+     * @param e
+     * @returns
+     */
+    function removeEmptyEntries(e) {
+        return !(typeof e === "undefined" || e === null || e === "");
+    }
     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]) {
+                // if prop exists and is not empty string
+                if (acc[key] && value !== "") {
                     // combine via operation
                     acc[key] = acc[key] + " " + operation + " " + value;
                 }
                 else {
-                    // just copy the value
-                    acc[key] = value;
+                    // just copy the value if it's not empty string
+                    if (value !== "") {
+                        acc[key] = value;
+                    }
                 }
             });
             return acc;
@@ -15207,7 +15091,9 @@
     function serializeFilter(filter) {
         var operation = filter.operation || "AND";
         var predicates = filter.predicates.map(expandPredicate);
-        var predicateSearchOptions = predicates.map(serializePredicate);
+        var predicateSearchOptions = predicates
+            .map(serializePredicate)
+            .filter(function (e) { return e !== undefined && e !== null; });
         // combine these searchOptions
         var searchOptions = mergeSearchOptions(predicateSearchOptions, operation);
         // wrap in parens if we have more than one predicate
@@ -15259,6 +15145,7 @@
             "snippet",
             "tags",
             "term",
+            "title",
             "type",
             "typekeywords",
             "userlicensetype",
@@ -15274,7 +15161,7 @@
             // not attempt to ensure the properties are used in the correct combinations
             if (portalAllowList.includes(key)) {
                 var so = { q: "" };
-                if (!specialProps.includes(key)) {
+                if (!specialProps.includes(key) && key !== "term") {
                     qCount++;
                     so.q = serializeMatchOptions(key, value);
                 }
@@ -15296,13 +15183,18 @@
                 return so;
             }
         })
-            .filter(function (e) { return e !== undefined; });
+            .filter(removeEmptyEntries);
         // merge up all the searchOptions
-        var searchOptions = mergeSearchOptions(opts, "AND");
-        if (qCount > 1) {
-            searchOptions.q = "(" + searchOptions.q + ")";
+        if (opts.length) {
+            var searchOptions = mergeSearchOptions(opts, "AND");
+            if (qCount > 1) {
+                searchOptions.q = "(" + searchOptions.q + ")";
+            }
+            return searchOptions;
+        }
+        else {
+            return null;
         }
-        return searchOptions;
     }
     /**
      * Serialize MatchOptions into portal syntax
@@ -15358,6 +15250,140 @@
         return q;
     }
 
+    /**
+     * Generic Hub Error with an Error stack as well
+     * as an optional serialized OperationStack.
+     *
+     * Also accepts a `rootCause` Error object
+     */
+    var HubError = /** @class */ (function (_super) {
+        __extends(HubError, _super);
+        /**
+         * Creates an instance of HubError.
+         * @param {string} operation
+         * @param {string} [message]
+         * @param {Error} [rootCause]
+         * @memberof HubError
+         */
+        function HubError(operation, message, rootCause) {
+            var _this = this;
+            message = message || "UNKNOWN_ERROR";
+            // if the rootCause has a .rootCause, use that so we don't deeply nest
+            rootCause = getWithDefault$1(rootCause, "rootCause", rootCause);
+            /* Skip coverage on super(...) as per:
+               https://github.com/Microsoft/TypeScript/issues/13029
+               https://github.com/SitePen/remap-istanbul/issues/106
+            */
+            /* istanbul ignore next */
+            _this = _super.call(this, operation, message, rootCause) || this;
+            _this.name = "HubError";
+            // if the original error has a stack use it, otherwise create a new
+            // stack. Note: a new Stack will make it look like the error origninated
+            // in the HubError constructor. This is only an issue in tests but
+            // it can be confusing to debug
+            _this.stack = getWithDefault$1(rootCause, "stack", new Error().stack);
+            return _this;
+        }
+        return HubError;
+    }(OperationError$1));
+    var HubError$1 = HubError;
+
+    /**
+     * Generic search that returns Hub Entity types converted from items
+     * by the passed in `ItemToEntityFunction`
+     *
+     * This abstraction is used to ensure that searching from any of the
+     * entity managers / modules is consistent, and returns the entity
+     * types, instead of `IItem` or `IHubContent`
+     *
+     * @param filter
+     * @param convertFn
+     * @param options
+     * @returns
+     */
+    function searchContentEntities(filter, convertFn, options) {
+        var _a, _b;
+        // expand filter so we can serialize to either api
+        var expanded = expandContentFilter(filter);
+        var searchOptions = serializeContentFilterForPortal(expanded);
+        // DEPRECATION
+        /* istanbul ignore next */
+        if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
+            // tslint:disable-next-line:no-console
+            console.warn("IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.");
+            searchOptions.countFields = options.aggregations.join(",");
+            searchOptions.countSize = options.aggLimit || 10;
+        }
+        // Aggregations
+        if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
+            searchOptions.countFields = options.aggFields.join(",");
+            searchOptions.countSize = options.aggLimit || 10;
+        }
+        // properties to copy from IHubSearchOptions to the ISearchOptions
+        var props = [
+            "authentication",
+            "num",
+            "sortField",
+            "sortOrder",
+            "site",
+            "start",
+        ];
+        // Include "start" here
+        // copy the props over
+        props.forEach(function (prop) {
+            if (options.hasOwnProperty(prop)) {
+                searchOptions[prop] = options[prop];
+            }
+        });
+        // create the entitySearchFn
+        var searchFn = createContentEntitySearchFn(convertFn);
+        // execute the search
+        // Add ArcGIS API
+        if (options.api && !options.authentication) {
+            var expandedApi = expandApi(options.api);
+            searchOptions.portal = expandedApi.url;
+        }
+        return searchFn(searchOptions);
+    }
+    /**
+     * Return a function that holds a closure containing
+     * a hub entity specific conversion function. This
+     * allows the `.next()` function to use the function on
+     * subsequent calls
+     * @param convertFn
+     * @returns
+     */
+    function createContentEntitySearchFn(convertFn) {
+        // Return a function that does the search, with a closure over the
+        // conversion function. Naming this function is important as it's
+        // referenced in the `next` section below
+        return function searchEntities(searchOptions) {
+            return __awaiter(this, void 0, void 0, function () {
+                var response, entities, facets;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, searchItems(searchOptions)];
+                        case 1:
+                            response = _a.sent();
+                            return [4 /*yield*/, Promise.all(response.results.map(function (itm) {
+                                    return convertFn(itm, searchOptions);
+                                }))];
+                        case 2:
+                            entities = _a.sent();
+                            facets = convertPortalResponseToFacets(response);
+                            return [2 /*return*/, {
+                                    total: response.total,
+                                    results: entities,
+                                    facets: facets,
+                                    hasNext: response.nextStart > -1,
+                                    next: getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
+                                }];
+                    }
+                });
+            });
+        };
+    }
+
     /**
      * Fetch Page specific Enrichments
      * @param item
@@ -20610,6 +20636,7 @@
     exports.serializeGroupFilterForPortal = serializeGroupFilterForPortal;
     exports.serializeMatchOptions = serializeMatchOptions$1;
     exports.serializeModel = serializeModel;
+    exports.serializeQueryForPortal = serializeQueryForPortal;
     exports.serializeSpatialReference = serializeSpatialReference;
     exports.serializeStringOrArray = serializeStringOrArray$1;
     exports.serializeUserFilterForPortal = serializeUserFilterForPortal;