@esri/hub-common 9.39.0 → 9.41.1

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.38.0 - Mon Jun 06 2022 22:49:18 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
  */
@@ -5444,6 +5444,17 @@
         return portalUrl + "/home/group.html?id=" + groupId;
     }
 
+    /**
+     * Return the URL of the user's page in the Portal Home application
+     * @param username The username
+     * @param portalUrlOrObject a portal base or API URL, a portal object, or request options containing either of those
+     * @returns URL to the user's profile, defaults to `https://www.arcgis.com/home/user.html?user={username}`
+     */
+    function getUserHomeUrl(username, portalUrlOrObject) {
+        var portalUrl = getPortalUrl(portalUrlOrObject);
+        return portalUrl + "/home/user.html?user=" + username;
+    }
+
     var MAP_OR_FEATURE_SERVER_URL_REGEX = /\/(map|feature)server/i;
     /**
      *
@@ -6434,6 +6445,14 @@
         return request(cleanUrl(options.url), options);
     }
 
+    exports.PublisherSource = void 0;
+    (function (PublisherSource) {
+        PublisherSource["CitationContact"] = "metadata.resource.citation.contact";
+        PublisherSource["ResourceContact"] = "metadata.resource.contact";
+        PublisherSource["ItemOwner"] = "item.owner";
+        PublisherSource["None"] = "none";
+    })(exports.PublisherSource || (exports.PublisherSource = {}));
+
     /**
      * Turns an bounding box coordinate array into an extent object
      * @param bBox bounding box coordinate array
@@ -7012,6 +7031,90 @@
             : undefined;
         return itemExtent || extentEnrichmentCoordinates || layerExtent;
     };
+    /**
+     * @private
+     *
+     * Extracts the first contact from a given formal item metadata path.
+     * This is particularly helpful if the contact path is either an object or an array.
+     *
+     * Note: the raw contact object must have the following properties:
+     * - `rpIndName`: name of the individual
+     * - `rpOrgName`: name of the individual's organization
+     *
+     * @param metadata formal item metadata
+     * @param path path to the contact object/array
+     * @returns
+     */
+    var extractFirstContact = function (metadata, path) {
+        var rawContacts = getProp(metadata, path) || {};
+        var _a = Array.isArray(rawContacts)
+            ? rawContacts[0]
+            : rawContacts, rpIndName = _a.rpIndName, rpOrgName = _a.rpOrgName;
+        return { individualName: rpIndName, organizationName: rpOrgName };
+    };
+    /**
+     * Determines the correct orgId for an item.
+     * Note: it's undocumented, but the portal API will return orgId for items... sometimes.
+     *
+     * @param item
+     * @param ownerUser item owner's hydrated user object
+     */
+    var getItemOrgId = function (item, ownerUser) {
+        return item.orgId || (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.orgId);
+    };
+    /**
+     * Calculates the Publisher display info for the given item.
+     * Utilizes this fallback pattern:
+     * 1) Formal Item Metadata > Resource > Citation > Contact
+     * 2) Formal Item Metadata > Resource > Contact
+     * 3) Item’s Owner and Org Name
+     * 4) Undefined (Item Owner / Org are private and we can't access additional info)
+     *
+     * @param item
+     * @param metadata
+     * @param org portal info of the item's organization
+     * @param ownerUser the item owner's hydrated user
+     * @returns
+     */
+    var getPublisherInfo = function (item, metadata, org, ownerUser) {
+        var result = {
+            nameSource: exports.PublisherSource.None,
+            organizationSource: exports.PublisherSource.None,
+        };
+        var citationContact = extractFirstContact(metadata, "metadata.dataIdInfo.idCitation.citRespParty");
+        var resourceContact = extractFirstContact(metadata, "metadata.mdContact");
+        // Determine publisher name properties
+        var ownerFullName = getProp(ownerUser, "fullName");
+        if (citationContact.individualName) {
+            result.name = citationContact.individualName;
+            result.nameSource = exports.PublisherSource.CitationContact;
+        }
+        else if (resourceContact.individualName) {
+            result.name = resourceContact.individualName;
+            result.nameSource = exports.PublisherSource.ResourceContact;
+        }
+        else if (ownerFullName) {
+            result.name = ownerFullName;
+            result.username = ownerUser.username;
+            result.nameSource = exports.PublisherSource.ItemOwner;
+        }
+        // Determine publisher org properties
+        var orgName = getProp(org, "name");
+        if (citationContact.organizationName) {
+            result.organization = citationContact.organizationName;
+            result.organizationSource = exports.PublisherSource.CitationContact;
+        }
+        else if (resourceContact.organizationName) {
+            result.organization = resourceContact.organizationName;
+            result.organizationSource = exports.PublisherSource.ResourceContact;
+        }
+        else if (orgName) {
+            result.organization = orgName;
+            result.orgId = getItemOrgId(item, ownerUser);
+            result.organizationSource = exports.PublisherSource.ItemOwner;
+        }
+        return result;
+    };
 
     var STANDARD_LICENSES = [
         {
@@ -7919,13 +8022,8 @@
             get metadataUpdateFrequency() {
                 return getUpdateFrequencyFromMetadata(metadata, "metadataUpdateFrequency");
             },
-            // TODO: add the publisher logic outlined here:
-            // https://devtopia.esri.com/dc/hub/issues/2932#issuecomment-3276309
             get publisher() {
-                return {
-                    name: item.owner,
-                    username: item.owner,
-                };
+                return getPublisherInfo(item, metadata, org, ownerUser);
             },
             // TODO: is metrics in use?
             get metrics() {
@@ -7945,11 +8043,10 @@
                     Array.isArray(data.layers) &&
                     data.layers.find(function (_layer) { return _layer.id === layer.id; });
                 return dataLayer ? dataLayer.layerDefinition : undefined;
+            }, get orgId() {
+                return org ? org.id : getItemOrgId(item, ownerUser);
             },
-            get orgId() {
-                // NOTE: it's undocumented, but the portal API will return orgId for items... sometimes
-                return org ? org.id : item.orgId || (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.orgId);
-            }, get contentTypeIcon() {
+            get contentTypeIcon() {
                 /* Note: only returns calcite-icons */
                 return getContentTypeIcon(type);
             },
@@ -9882,6 +9979,24 @@
     };
     });
 
+    /**
+     * Fetches the portal for a given org.
+     *
+     * @param orgId
+     * @param options request options
+     * @returns
+     */
+    var fetchOrg = function (orgId, options) {
+        var orgPortalUrl = getProp(options, "portal") ||
+            getProp(options, "authentication.portal") ||
+            "www.arcgis.com";
+        // In order to get the correct response, we must pass options.portal
+        // as a base portal url (e.g., www.arcgis.com, qaext.arcgis.com, etc)
+        // **not** an org portal (i.e. org.maps.arcgis.com).
+        var basePortalUrl = getPortalBaseFromOrgUrl(orgPortalUrl) + "/sharing/rest";
+        return getPortal(orgId, __assign(__assign({}, options), { portal: basePortalUrl }));
+    };
+
     /**
      * Parse metadataxml into json object
      * @param metadataXml
@@ -9928,7 +10043,7 @@
                 requestOptions: requestOptions,
             };
         })
-            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); });
     };
     var enrichMetadata = function (input) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
@@ -9960,7 +10075,25 @@
                 requestOptions: requestOptions,
             };
         })
-            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); });
+    };
+    // Note, this MUST be run after `enrichOwnerUser` to access the correct orgId during
+    // processing. `item.orgId` is only SOMETIMES returned by Portal, so we need to have
+    // the ownerUser's orgId as a backup.
+    var enrichOrg = function (input) {
+        var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
+        var opId = stack.start("enrichOrg");
+        var orgId = getItemOrgId(data.item, data.ownerUser);
+        return fetchOrg(orgId, requestOptions)
+            .then(function (org) {
+            stack.finish(opId);
+            return {
+                data: __assign(__assign({}, data), { org: org }),
+                stack: stack,
+                requestOptions: requestOptions,
+            };
+        })
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); });
     };
     var enrichData = function (input) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
@@ -9970,7 +10103,7 @@
             stack.finish(opId);
             return { data: __assign(__assign({}, data), { data: itemData }), stack: stack, requestOptions: requestOptions };
         })
-            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); });
     };
     var enrichServer = function (input) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
@@ -9982,7 +10115,7 @@
             stack.finish(opId);
             return { data: __assign(__assign({}, data), { server: server }), stack: stack, requestOptions: requestOptions };
         })
-            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); });
     };
     var enrichLayers = function (input) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
@@ -10000,12 +10133,12 @@
             stack.finish(opId);
             return { data: __assign(__assign({}, data), { layers: layers }), stack: stack, requestOptions: requestOptions };
         })
-            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); }));
+            .catch(function (error) { return handleEnrichmentError$2(error, input, opId); }));
     };
     // add the error to the content.errors,
     // log current stack operation as finished with an error
     // and return output that can be piped into the next operation
-    var handleEnrichmentError$1 = function (error, input, opId) {
+    var handleEnrichmentError$2 = function (error, input, opId) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
         stack.finish(opId, { error: error });
         return {
@@ -10018,6 +10151,7 @@
         groupIds: enrichGroupIds,
         metadata: enrichMetadata,
         ownerUser: enrichOwnerUser,
+        org: enrichOrg,
         data: enrichData,
         server: enrichServer,
         layers: enrichLayers,
@@ -13099,7 +13233,7 @@
                 requestOptions: requestOptions,
             };
         })
-            .catch(function (error) { return handleEnrichmentError(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
     };
     /**
      * Create a summary of the Group membership by searching for members,
@@ -13124,12 +13258,12 @@
                 requestOptions: requestOptions,
             };
         })
-            .catch(function (error) { return handleEnrichmentError(error, input, opId); });
+            .catch(function (error) { return handleEnrichmentError$1(error, input, opId); });
     };
     // add the error to the content.errors,
     // log current stack operation as finished with an error
     // and return output that can be piped into the next operation
-    var handleEnrichmentError = function (error, input, opId) {
+    var handleEnrichmentError$1 = function (error, input, opId) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
         stack.finish(opId, { error: error });
         return {
@@ -13141,7 +13275,7 @@
     /**
      * Available enrichments for Groups
      */
-    var groupEnrichementOperations = {
+    var groupEnrichementOperations$1 = {
         membershipSummary: enrichGroupMembershipSummary,
         contentCount: enrichGroupContentCount,
     };
@@ -13155,7 +13289,7 @@
     function fetchGroupEnrichments(group, enrichments, requestOptions) {
         // create a pipeline of enrichment operations
         var operations = enrichments.reduce(function (ops, enrichment) {
-            var operation = groupEnrichementOperations[enrichment];
+            var operation = groupEnrichementOperations$1[enrichment];
             // only include the enrichments that we know how to fetch
             operation && ops.push(operation);
             return ops;
@@ -13401,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);
@@ -13997,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) {
@@ -14030,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;
@@ -14165,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
@@ -14305,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
@@ -14371,7 +14505,7 @@
                         so_1.countFields = options.aggFields.join(",");
                         so_1.countSize = options.aggLimit || 10;
                     }
-                    searchPromise = searchPortal$2(so_1);
+                    searchPromise = searchPortal$3(so_1);
                 }
                 else {
                     // Hub API Search
@@ -14399,7 +14533,7 @@
      * @param site
      * @returns
      */
-    function searchPortal$2(searchOptions) {
+    function searchPortal$3(searchOptions) {
         var _a;
         var portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) || searchOptions.portal;
         var token;
@@ -14430,7 +14564,7 @@
                 results: content,
                 facets: facets,
                 hasNext: hasNext,
-                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$2),
+                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$3),
             };
         });
     }
@@ -14837,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) {
@@ -14870,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
@@ -14900,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
@@ -17680,7 +17847,7 @@
                     so.countFields = options.aggFields.join(",");
                     so.countSize = options.aggLimit || 10;
                 }
-                return [2 /*return*/, searchPortal$1(so)];
+                return [2 /*return*/, searchPortal$2(so)];
             });
         });
     }
@@ -17691,7 +17858,7 @@
      * @param searchOptions
      * @returns
      */
-    function searchPortal$1(searchOptions) {
+    function searchPortal$2(searchOptions) {
         return __awaiter(this, void 0, void 0, function () {
             var resp, fn, results, facets;
             return __generator(this, function (_a) {
@@ -17712,7 +17879,7 @@
                                 results: results,
                                 facets: facets,
                                 hasNext: resp.nextStart > -1,
-                                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$1),
+                                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$2),
                             }];
                 }
             });
@@ -18000,7 +18167,7 @@
                 if (!so.authentication) {
                     so.portal = so.requestOptions.portal || api.url + "/sharing/rest";
                 }
-                return [2 /*return*/, searchPortal(so)];
+                return [2 /*return*/, searchPortal$1(so)];
             });
         });
     }
@@ -18011,7 +18178,7 @@
      * @param searchOptions
      * @returns
      */
-    function searchPortal(searchOptions) {
+    function searchPortal$1(searchOptions) {
         return __awaiter(this, void 0, void 0, function () {
             var resp, fn, results;
             return __generator(this, function (_a) {
@@ -18032,7 +18199,7 @@
                                 results: results,
                                 facets: [],
                                 hasNext: resp.nextStart > -1,
-                                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
+                                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal$1),
                             }];
                 }
             });
@@ -18059,6 +18226,104 @@
         });
     }
 
+    /**
+     * @private
+     * Portal Search implementation for Users
+     * @param filterGroups
+     * @param options
+     */
+    function portalSearchUsers(filterGroups, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var expandedGroups, so, props;
+            return __generator(this, function (_a) {
+                // requestOptions is always required and user must be authd
+                if (!options.requestOptions) {
+                    throw new HubError$1("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
+                }
+                if (!options.requestOptions.authentication) {
+                    throw new HubError$1("portalSearchUsers", "requestOptions must pass authentication.");
+                }
+                expandedGroups = filterGroups.map(function (fg) {
+                    fg.filters = fg.filters.map(expandFilter);
+                    return fg;
+                });
+                so = serializeFilterGroupsForPortal(expandedGroups);
+                props = [
+                    "num",
+                    "sortField",
+                    "sortOrder",
+                    "include",
+                    "start",
+                    "requestOptions",
+                ];
+                // copy the props over
+                props.forEach(function (prop) {
+                    if (options.hasOwnProperty(prop)) {
+                        so[prop] = options[prop];
+                    }
+                });
+                // Ensure authentication gets sent
+                so.authentication = options.requestOptions.authentication;
+                // Execute search
+                return [2 /*return*/, searchPortal(so)];
+            });
+        });
+    }
+    /**
+     * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
+     * handling enrichments & includes along the way
+     *
+     * @param searchOptions
+     * @returns
+     */
+    function searchPortal(searchOptions) {
+        return __awaiter(this, void 0, void 0, function () {
+            var resp, fn, results;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, searchUsers(searchOptions)];
+                    case 1:
+                        resp = _a.sent();
+                        fn = function (user) {
+                            return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
+                        };
+                        return [4 /*yield*/, Promise.all(resp.results.map(fn))];
+                    case 2:
+                        results = _a.sent();
+                        // Group Search does not support aggregations
+                        // Construct the return
+                        return [2 /*return*/, {
+                                total: resp.total,
+                                results: results,
+                                facets: [],
+                                hasNext: resp.nextStart > -1,
+                                next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
+                            }];
+                }
+            });
+        });
+    }
+    /**
+     * Convert an Item to a IHubSearchResult
+     * Fetches the includes and attaches them to the item
+     * @param item
+     * @param includes
+     * @param requestOptions
+     * @returns
+     */
+    function userToSearchResult(user, includes, requestOptions) {
+        if (includes === void 0) { includes = []; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                // Delegate to HubGroups module
+                // This layer of indirection is not necessary but
+                // aligns with how the items search works and
+                // allows for future specialization
+                return [2 /*return*/, enrichUserSearchResult(user, includes, requestOptions)];
+            });
+        });
+    }
+
     /**
      * Main Search function for ArcGIS Hub
      *
@@ -18092,6 +18357,7 @@
                     arcgis: {
                         item: portalSearchItems,
                         group: portalSearchGroups,
+                        user: portalSearchUsers,
                     },
                     "arcgis-hub": {
                         item: hubSearchItems,
@@ -18101,7 +18367,7 @@
                 if (!fn) {
                     throw new HubError$1("hubSearch", "Search via \"" + filterType + "\" filter against \"" + apiType + "\" api is not implemented");
                 }
-                return [2 /*return*/, fn(filterGroups, options)];
+                return [2 /*return*/, fn(cloneObject$1(filterGroups), options)];
             });
         });
     }
@@ -19575,6 +19841,145 @@
         return Hub;
     }());
 
+    var enrichUserOrg = function (input) {
+        var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
+        var opId = stack.start("enrichUserOrg");
+        var options = __assign(__assign({}, requestOptions), { 
+            // In order to get the correct response, we must pass options.portal
+            // as a base portal url (e.g., www.arcgis.com, qaext.arcgis.com, etc)
+            // **not** an org portal (i.e. org.maps.arcgis.com).
+            portal: getPortalBaseFromOrgUrl(requestOptions.portal) + "/sharing/rest" });
+        // TODO: Add Caching
+        // Had implemented a simple caching system, but it leads to unstable
+        // tests because we can't deterministically clear it
+        // if (!orgCache[data.user.orgId]) {
+        //   orgCache[data.user.orgId] = fetchOrg(data.user.orgId, options);
+        // }
+        // return (orgCache[data.user.orgId] as Promise<IPortal>)
+        return fetchOrg(data.user.orgId, options)
+            .then(function (results) {
+            stack.finish(opId);
+            return {
+                data: __assign(__assign({}, data), {
+                    org: results,
+                }),
+                stack: stack,
+                requestOptions: requestOptions,
+            };
+        })
+            .catch(function (error) { return handleEnrichmentError(error, input, opId); });
+    };
+    /**
+     * Simple cache for user org's. This does not expire
+     * but that seems reasonable as Org props rarely change
+     */
+    // This works find at run-time, but it's a problem in tests
+    // where we are validating calls. Will work with Randy to
+    // create something that's more robust
+    // const orgCache: Record<string, any> = {};
+    // add the error to the content.errors,
+    // log current stack operation as finished with an error
+    // and return output that can be piped into the next operation
+    var handleEnrichmentError = function (error, input, opId) {
+        var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
+        stack.finish(opId, { error: error });
+        return {
+            data: __assign(__assign({}, data), { errors: getEnrichmentErrors(error, data.errors) }),
+            stack: stack,
+            requestOptions: requestOptions,
+        };
+    };
+    /**
+     * Available enrichments for Groups
+     */
+    var groupEnrichementOperations = {
+        org: enrichUserOrg,
+    };
+    /**
+     * Fetch enrichments for Users
+     * @param group
+     * @param enrichments
+     * @param requestOptions
+     * @returns
+     */
+    function fetchUserEnrichments(user, enrichments, requestOptions) {
+        // create a pipeline of enrichment operations
+        var operations = enrichments.reduce(function (ops, enrichment) {
+            var operation = groupEnrichementOperations[enrichment];
+            // only include the enrichments that we know how to fetch
+            operation && ops.push(operation);
+            return ops;
+        }, []);
+        var pipeline = createOperationPipeline(operations);
+        // execute pipeline and return the item and enrichments
+        return pipeline({
+            data: { user: user },
+            stack: new OperationStack$1(),
+            requestOptions: requestOptions,
+        }).then(function (output) {
+            // TODO: send telemetry so we have info on what enrichments are requested and possible errors
+            return output.data;
+        });
+    }
+
+    /**
+     * Enrich a User object
+     * @param user
+     * @param includes
+     * @param requestOptions
+     * @returns
+     */
+    function enrichUserSearchResult(user, include, requestOptions) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, DEFAULTS, specs, enrichments, enriched, token;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        result = {
+                            access: user.access,
+                            id: user.username,
+                            type: "User",
+                            name: user.fullName,
+                            owner: user.username,
+                            summary: user.description,
+                            createdDate: new Date(user.created),
+                            createdDateSource: "user.created",
+                            updatedDate: new Date(user.modified),
+                            updatedDateSource: "user.modified",
+                            family: "people",
+                            links: {
+                                self: "not-implemented",
+                                siteRelative: "not-implemented",
+                                thumbnail: "not-implemented",
+                            },
+                        };
+                        DEFAULTS = ["org.name AS orgName"];
+                        // merge includes
+                        include = __spreadArrays(DEFAULTS, include).filter(unique);
+                        specs = include.map(parseInclude);
+                        enrichments = mapBy("enrichment", specs).filter(unique);
+                        enriched = {};
+                        if (!enrichments.length) return [3 /*break*/, 2];
+                        return [4 /*yield*/, fetchUserEnrichments(user, enrichments, requestOptions)];
+                    case 1:
+                        enriched = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        // map the enriched props onto the result
+                        specs.forEach(function (spec) {
+                            result[spec.prop] = getProp(enriched, spec.path);
+                        });
+                        token = requestOptions.authentication.token;
+                        // Handle links
+                        result.links.thumbnail = getUserThumbnailUrl(requestOptions.portal, user, token);
+                        result.links.self = getUserHomeUrl(result.id, requestOptions);
+                        result.links.siteRelative = "/people/" + result.id;
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    }
+
     exports.ArcGISContext = ArcGISContext;
     exports.ArcGISContextManager = ArcGISContextManager;
     exports.DEFAULT_THEME = DEFAULT_THEME;
@@ -19702,6 +20107,7 @@
     exports.enrichPageSearchResult = enrichPageSearchResult;
     exports.enrichProjectSearchResult = enrichProjectSearchResult;
     exports.enrichSiteSearchResult = enrichSiteSearchResult;
+    exports.enrichUserSearchResult = enrichUserSearchResult;
     exports.ensureProp = ensureProp;
     exports.ensureUniqueDomainName = ensureUniqueDomainName;
     exports.ensureUniqueString = ensureUniqueString;
@@ -19724,6 +20130,7 @@
     exports.fetchHubTranslation = fetchHubTranslation;
     exports.fetchImageAsBlob = fetchImageAsBlob;
     exports.fetchModelFromItem = fetchModelFromItem;
+    exports.fetchOrg = fetchOrg;
     exports.fetchProject = fetchProject;
     exports.fetchSite = fetchSite;
     exports.fetchSiteModel = fetchSiteModel;
@@ -19792,6 +20199,7 @@
     exports.getUniqueDomainNamePortal = getUniqueDomainNamePortal;
     exports.getUniqueItemTitle = getUniqueItemTitle;
     exports.getUniqueSlug = getUniqueSlug;
+    exports.getUserHomeUrl = getUserHomeUrl;
     exports.getUserThumbnailUrl = getUserThumbnailUrl;
     exports.getWithDefault = getWithDefault$1;
     exports.hasBasePriv = hasBasePriv;
@@ -19830,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;