@esri/hub-common 14.20.0 → 14.21.0

package/dist/esm/discussions/utils.js

@@ -1,4 +1,5 @@
 import { CANNOT_DISCUSS } from "./constants";
+import { AclCategory, AclSubCategory, SharingAccess, } from "./api/types";
 /**
  * Utility to determine if a given IGroup, IItem, IHubContent, or IHubItemEntity
  * is discussable.
@@ -22,4 +23,137 @@ export function setDiscussableKeyword(typeKeywords, discussable) {
     }
     return updatedTypeKeywords;
 }
+/**
+ * Determines if the given channel is considered to be a `public` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `public`
+ */
+export function isPublicChannel(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.some(({ category }) => category === AclCategory.AUTHENTICATED_USER)
+        : channel.access === SharingAccess.PUBLIC;
+}
+/**
+ * Determines if the given channel is considered to be an `org` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `org`
+ */
+export function isOrgChannel(channel) {
+    return channel.channelAcl
+        ? !isPublicChannel(channel) &&
+            channel.channelAcl.some(({ category, subCategory }) => category === AclCategory.ORG &&
+                subCategory === AclSubCategory.MEMBER)
+        : channel.access === SharingAccess.ORG;
+}
+/**
+ * Determines if the given channel is considered to be a `private` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `private`
+ */
+export function isPrivateChannel(channel) {
+    return !isPublicChannel(channel) && !isOrgChannel(channel);
+}
+/**
+ * Determines the given channel's access, supporting both legacy permissions and V2 ACL
+ * model.
+ * @param channel An IChannel record
+ * @returns `public`, `org` or `private`
+ */
+export function getChannelAccess(channel) {
+    let access = SharingAccess.PRIVATE;
+    if (isPublicChannel(channel)) {
+        access = SharingAccess.PUBLIC;
+    }
+    else if (isOrgChannel(channel)) {
+        access = SharingAccess.ORG;
+    }
+    return access;
+}
+/**
+ * Returns an array of org ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of org ids for the given channel
+ */
+export function getChannelOrgIds(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.reduce((acc, permission) => permission.category === AclCategory.ORG &&
+            permission.subCategory === AclSubCategory.MEMBER
+            ? [...acc, permission.key]
+            : acc, [])
+        : channel.orgs;
+}
+/**
+ * Returns an array of group ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of group ids for the given channel
+ */
+export function getChannelGroupIds(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.reduce((acc, permission) => permission.category === AclCategory.GROUP &&
+            permission.subCategory === AclSubCategory.MEMBER
+            ? [...acc, permission.key]
+            : acc, [])
+        : channel.groups;
+}
+/**
+ * A utility method used to build an IQuery to search for users that are permitted to be at-mentioned for the given channel.
+ * @param input An array of strings to search for. Each string is mapped to `username` and `fullname`, filters as an OR condition
+ * @param channel An IChannel record
+ * @param currentUsername The currently authenticated user's username
+ * @param options An IHubSearchOptions object
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult>
+ */
+export function getChannelUsersQuery(inputs, channel, currentUsername) {
+    const groupIds = getChannelGroupIds(channel);
+    const orgIds = getChannelOrgIds(channel);
+    const groupsPredicate = { group: groupIds };
+    let filters;
+    if (isPublicChannel(channel)) {
+        filters = [
+            {
+                operation: "OR",
+                predicates: [{ orgid: { from: "0", to: "{" } }],
+            },
+        ];
+    }
+    else if (isOrgChannel(channel)) {
+        const additional = groupIds.length ? [groupsPredicate] : [];
+        filters = [
+            {
+                operation: "OR",
+                predicates: [{ orgid: orgIds }, ...additional],
+            },
+        ];
+    }
+    else {
+        filters = [
+            {
+                operation: "AND",
+                predicates: [groupsPredicate],
+            },
+        ];
+    }
+    if (currentUsername) {
+        filters.push({
+            operation: "AND",
+            predicates: [{ username: { not: currentUsername } }],
+        });
+    }
+    const query = {
+        targetEntity: "communityUser",
+        filters: [
+            {
+                operation: "OR",
+                predicates: inputs.reduce((acc, input) => [...acc, { username: input }, { fullname: input }], []),
+            },
+            ...filters,
+        ],
+    };
+    return query;
+}
 //# sourceMappingURL=utils.js.map

package/dist/esm/discussions/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAK7C;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,OAA+D;;IAE/D,OAAO,CAAC,OAAC,OAAO,CAAC,YAAY,mCAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAAsB,EACtB,WAAoB;IAEpB,MAAM,mBAAmB,GAAG,YAAY,CAAC,MAAM,CAC7C,CAAC,WAAmB,EAAE,EAAE,CAAC,WAAW,KAAK,cAAc,CACxD,CAAC;IACF,IAAI,CAAC,WAAW,EAAE;QAChB,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;KAC1C;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/search/_internal/portalSearchGroupMembers.js

@@ -157,6 +157,6 @@ async function memberToSearchResult(member, include = [], requestOptions) {
             setProp(key, fetchedUser[key], user);
         }
     });
-    return enrichUserSearchResult(user, include, requestOptions);
+    return enrichUserSearchResult(user, ["org.name as OrgName", ...include], requestOptions);
 }
 //# sourceMappingURL=portalSearchGroupMembers.js.map

package/dist/esm/search/_internal/portalSearchGroupMembers.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":"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"}

package/dist/esm/search/_internal/portalSearchUsers.js

@@ -1,31 +1,26 @@
-import { searchUsers, } from "@esri/arcgis-rest-portal";
+import { searchUsers, searchCommunityUsers as _searchCommunityUsers, } from "@esri/arcgis-rest-portal";
 import { enrichUserSearchResult } from "../../users";
 import { serializeQueryForPortal } from "../serializeQueryForPortal";
 import HubError from "../../HubError";
 import { getNextFunction } from "../utils";
 import { expandPredicate } from "./expandPredicate";
-/**
- * @private
- * Portal Search Implementation for Users
- * @param filterGroups
- * @param options
- * @returns
- */
-export async function portalSearchUsers(query, options) {
+import { cloneObject } from "../../util";
+function buildSearchOptions(query, options, operation) {
     // requestOptions is always required and user must be authd
     if (!options.requestOptions) {
-        throw new HubError("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
+        throw new HubError(operation, "requestOptions: IHubRequestOptions is required.");
     }
     if (!options.requestOptions.authentication) {
-        throw new HubError("portalSearchUsers", "requestOptions must pass authentication.");
+        throw new HubError(operation, "requestOptions must pass authentication.");
     }
+    const clonedQuery = cloneObject(query);
     // Expand the individual predicates in each filter
-    query.filters = query.filters.map((filter) => {
+    clonedQuery.filters = clonedQuery.filters.map((filter) => {
         filter.predicates = filter.predicates.map(expandPredicate);
         return filter;
     });
     // Serialize the all the groups for portal
-    const so = serializeQueryForPortal(query);
+    const so = serializeQueryForPortal(clonedQuery);
     // Array of properties we want to copy from IHubSearchOptions to the ISearchOptions
     const props = [
         "num",
@@ -44,26 +39,96 @@ export async function portalSearchUsers(query, options) {
     // Unlike Groups and Item, the Users api *requires* authentication
     // so we set it directly
     so.authentication = options.requestOptions.authentication;
+    return so;
+}
+/**
+ * @private
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * Automatically adds "org.name as OrgName" enrichment
+ *
+ * DEPRECATED: This method will be deprecated in a future release, as it's not ideal to impose default enrichments in all
+ * cases. When this method is depreated, all places that currently call `hubSearch` with a `targetEntity` of `user` will
+ * need to be updated to use the `portalUser` `targetEntity` and explicitly pass `"org.name as OrgName"` in `inclues` to
+ * preserve that enrichment, if needed. E.g.
+ *
+ * ```js
+ * // before
+ * await hubSearch(
+ *   { targetEntity: "user", ... },
+ *   { start: 1, ... },
+ * );
+ *
+ * // after
+ * await hubSearch(
+ *   { targetEntity: "portalUser", ... },
+ *   { start: 1, include: ["org.name as OrgName", ...], ... },
+ * );
+ * ```
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+export function searchPortalUsersLegacy(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchPortalUsersLegacy");
+    // Execute search
+    return searchPortal(Object.assign(Object.assign({}, searchOptions), { include: ["org.name as OrgName", ...(searchOptions.include || [])] }));
+}
+/**
+ * @private
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+export function searchPortalUsers(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchPortalUsers");
+    // Execute search
+    return searchPortal(searchOptions);
+}
+/**
+ * @private
+ *
+ * Community Search Implementation for Users within in any organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+export function searchCommunityUsers(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchCommunityUsers");
     // Execute search
-    return searchPortal(so);
+    return searchCommunity(searchOptions);
+}
+/**
+ * @private
+ * @param searchOptions An IUserSearchOptions object
+ * @param searchResponse A ISearchResult<IUser> object
+ * @returns
+ */
+function mapUsersToSearchResults(searchOptions, searchResponse) {
+    // create mappable fn that will close
+    // over the includes and requestOptions
+    const fn = (user) => userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
+    return Promise.all(searchResponse.results.map(fn));
 }
 /**
  * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
  * handling enrichments & includes along the way
  *
  * @param searchOptions
- * @returns
+ * @returns a promise that resolves enriched internal portal user search results
  */
 async function searchPortal(searchOptions) {
     // Execute portal search
     const resp = await searchUsers(searchOptions);
-    // create mappable fn that will close
-    // over the includes and requestOptions
-    const fn = (user) => {
-        return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
-    };
     // map over results
-    const results = await Promise.all(resp.results.map(fn));
+    const results = await mapUsersToSearchResults(searchOptions, resp);
     // Group Search does not support aggregations
     // Construct the return
     return {
@@ -73,6 +138,27 @@ async function searchPortal(searchOptions) {
         next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
     };
 }
+/**
+ * Community search, which then converts `IGroup`s to `IHubSearchResult`s
+ * handling enrichments & includes along the way
+ *
+ * @param searchOptions
+ * @returns a promise that resolves enriched community user search results
+ */
+async function searchCommunity(searchOptions) {
+    // Execute portal search
+    const resp = await _searchCommunityUsers(searchOptions);
+    // map over results
+    const results = await mapUsersToSearchResults(searchOptions, resp);
+    // Group Search does not support aggregations
+    // Construct the return
+    return {
+        total: resp.total,
+        results,
+        hasNext: resp.nextStart > -1,
+        next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchCommunity),
+    };
+}
 /**
  * Convert an Item to a IHubSearchResult
  * Fetches the includes and attaches them to the item
@@ -81,7 +167,7 @@ async function searchPortal(searchOptions) {
  * @param requestOptions
  * @returns
  */
-async function userToSearchResult(user, include = [], requestOptions) {
+function userToSearchResult(user, include = [], requestOptions) {
     // Delegate to HubUsers module
     // This layer of indirection is not necessary but
     // aligns with how the items search works and

package/dist/esm/search/_internal/portalSearchUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":"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"}

package/dist/esm/search/hubSearch.js

@@ -6,7 +6,7 @@ import { getApi } from "./_internal/commonHelpers/getApi";
 import { portalSearchGroupMembers } from "./_internal/portalSearchGroupMembers";
 import { portalSearchItems } from "./_internal/portalSearchItems";
 import { portalSearchGroups } from "./_internal/portalSearchGroups";
-import { portalSearchUsers } from "./_internal/portalSearchUsers";
+import { searchPortalUsersLegacy, searchPortalUsers, searchCommunityUsers } from "./_internal/portalSearchUsers";
 import { hubSearchItems } from "./_internal/hubSearchItems";
 import { hubSearchChannels } from "./_internal/hubSearchChannels";
 /**
@@ -50,7 +50,9 @@ export async function hubSearch(query, options) {
         arcgis: {
             item: portalSearchItems,
             group: portalSearchGroups,
-            user: portalSearchUsers,
+            user: searchPortalUsersLegacy,
+            portalUser: searchPortalUsers,
+            communityUser: searchCommunityUsers,
             groupMember: portalSearchGroupMembers,
         },
         "arcgis-hub": {

package/dist/esm/search/hubSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOtC,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC9C,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,yDAAyD,CAC1D,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,8EAA8E;IAC9E,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,UAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,WAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,iBAAiB;YACvB,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,iBAAiB;YACvB,WAAW,EAAE,wBAAwB;SACtC;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,iBAAiB;SAC3B;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOtC,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACjH,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC9C,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,yDAAyD,CAC1D,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,8EAA8E;IAC9E,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,UAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,WAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,iBAAiB;YACvB,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,uBAAuB;YAC7B,UAAU,EAAE,iBAAiB;YAC7B,aAAa,EAAE,oBAAoB;YACnC,WAAW,EAAE,wBAAwB;SACtC;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,iBAAiB;SAC3B;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC"}

package/dist/esm/search/serializeQueryForPortal.js

@@ -141,8 +141,8 @@ function serializePredicate(predicate) {
             if (!specialProps.includes(key) && key !== "term") {
                 so.q = serializeMatchOptions(key, value);
             }
-            if (dateProps.includes(key)) {
-                so.q = serializeDateRange(key, value);
+            if (dateProps.includes(key) || isRange(value)) {
+                so.q = serializeRange(key, value);
             }
             if (boolProps.includes(key)) {
                 so.q = `${key}:${value}`;
@@ -202,12 +202,12 @@ function serializeMatchOptions(key, value) {
     return result;
 }
 /**
- * Serialize a date-range into Portal syntax
+ * Serialize a range into Portal syntax
  * @param key
  * @param range
  * @returns
  */
-function serializeDateRange(key, range) {
+function serializeRange(key, range) {
     return `${key}:[${range.from} TO ${range.to}]`;
 }
 /**
@@ -230,4 +230,14 @@ function serializeStringOrArray(join, key, value) {
     }
     return q;
 }
+/**
+ * Determines if the given value is a range object
+ * @param value A search param value
+ * @returns true when the value is a range object, e.g. { from: '0', to: '{' }
+ */
+function isRange(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        ["from", "to"].every((key) => typeof value[key] !== "undefined"));
+}
 //# sourceMappingURL=serializeQueryForPortal.js.map

package/dist/esm/search/serializeQueryForPortal.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACnD,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC/D,2BAA2B;IAC3B,MAAM,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,kBAAkB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAE1D,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,aAAa,EAAE;QACjB,MAAM,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC;KAC9C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,CAAM;IAChC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAyB,EACzB,SAAuB;IAEvB,MAAM,MAAM,GAAmB,OAAO,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACb,iBAAiB;QACjB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7C,yCAAyC;YACzC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,EAAE,EAAE;gBAC5B,wBAAwB;gBACxB,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;aAChD;iBAAM;gBACL,+CAA+C;gBAC/C,IAAI,KAAK,KAAK,EAAE,EAAE;oBAChB,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAClB;aACF;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CACV,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,MAAe;IACtC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE1D,MAAM,sBAAsB,GAAG,UAAU;SACtC,GAAG,CAAC,kBAAkB,CAAC;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IAEhD,8BAA8B;IAC9B,MAAM,aAAa,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAC5E,oDAAoD;IACpD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,aAAa,CAAC,CAAC,GAAG,IAAI,aAAa,CAAC,CAAC,GAAG,CAAC;KAC1C;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AACD;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,SAAqB;IAC/C,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAC/C,+DAA+D;IAC/D,oCAAoC;IACpC,MAAM,gBAAgB,GAAG;QACvB,kBAAkB;QAClB,gBAAgB;QAChB,YAAY;QACZ,MAAM;QACN,mBAAmB;QACnB,gBAAgB;QAChB,MAAM;QACN,QAAQ;KACT,CAAC;IACF,MAAM,YAAY,GAAG;QACnB,YAAY;QACZ,MAAM;QACN,GAAG,SAAS;QACZ,GAAG,SAAS;QACZ,GAAG,gBAAgB;KACpB,CAAC;IACF,MAAM,eAAe,GAAG;QACtB,QAAQ;QACR,cAAc;QACd,SAAS;QACT,YAAY;QACZ,mBAAmB;QACnB,gBAAgB;QAChB,aAAa;QACb,UAAU;QACV,OAAO;QACP,aAAa;QACb,WAAW;QACX,UAAU;QACV,OAAO;QACP,IAAI;QACJ,kBAAkB;QAClB,YAAY;QACZ,QAAQ;QACR,WAAW;QACX,UAAU;QACV,YAAY;QACZ,UAAU;QACV,MAAM;QACN,OAAO;QACP,QAAQ;QACR,OAAO;QACP,UAAU;QACV,MAAM;QACN,kBAAkB;QAClB,gBAAgB;QAChB,SAAS;QACT,MAAM;QACN,MAAM;QACN,OAAO;QACP,MAAM;QACN,cAAc;QACd,iBAAiB;QACjB,UAAU;QACV,YAAY;KACb,CAAC;IAEF,8DAA8D;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpB,+DAA+D;QAC/D,oEAAoE;QACpE,4EAA4E;QAC5E,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,MAAM,EAAE,GAAmB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,MAAM,EAAE;gBACjD,EAAE,CAAC,CAAC,GAAG,qBAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAC1C;YACD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3B,EAAE,CAAC,CAAC,GAAG,kBAAkB,CACvB,GAAG,EACH,KAAsC,CACvC,CAAC;aACH;YACD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3B,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;aAC1B;YACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAClC,kEAAkE;gBAClE,4DAA4D;gBAC5D,uEAAuE;gBACvE,IAAI,GAAG,KAAK,QAAQ,EAAE;oBACpB,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;iBACvC;qBAAM;oBACL,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACjB;aACF;YACD,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;aACd;YACD,OAAO,EAAE,CAAC;SACX;IACH,CAAC,CAAC;SACD,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAE9B,iCAAiC;IACjC,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,MAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtD,IAAI,aAAa,CAAC,CAAC,EAAE;YACnB,aAAa,CAAC,CAAC,GAAG,IAAI,aAAa,CAAC,CAAC,GAAG,CAAC;SAC1C;QACD,OAAO,aAAa,CAAC;KACtB;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAW,EAAE,KAAoB;IAC9D,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,GAAG,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;KAC5D;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,MAAM;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;KACtD;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,qCAAqC;QACrC,MAAM;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChC,GAAG,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;KAC3D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,GAAW,EAAE,KAAyB;IAChE,OAAO,GAAG,GAAG,KAAK,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,GAAG,CAAC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAC7B,IAAkB,EAClB,GAAW,EACX,KAAwB;IAExB,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,CAAC,GAAG,GAAG,GAAG,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;QACnD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;SACd;KACF;SAAM;QACL,CAAC,GAAG,GAAG,GAAG,KAAK,KAAK,GAAG,CAAC;KACzB;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"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"}

package/dist/esm/users/HubUsers.js

@@ -47,14 +47,8 @@ export async function enrichUserSearchResult(user, include, requestOptions) {
         result.memberType = user.memberType;
         result.isGroupOwner = user.isGroupOwner;
     }
-    // Informal Enrichments - basically adding type-specific props
-    // derived directly from the entity
-    // default includes
-    const DEFAULTS = ["org.name AS orgName"];
-    // merge includes
-    include = [...DEFAULTS, ...include].filter(unique);
     // Parse the includes into a valid set of enrichments
-    const specs = include.map(parseInclude);
+    const specs = include.filter(unique).map(parseInclude);
     // Extract out the low-level enrichments needed
     const enrichments = mapBy("enrichment", specs).filter(unique);
     // fetch the enrichments

package/dist/esm/users/HubUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":"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"}

package/dist/node/discussions/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setDiscussableKeyword = exports.isDiscussable = void 0;
+exports.getChannelUsersQuery = exports.getChannelGroupIds = exports.getChannelOrgIds = exports.getChannelAccess = exports.isPrivateChannel = exports.isOrgChannel = exports.isPublicChannel = exports.setDiscussableKeyword = exports.isDiscussable = void 0;
 const constants_1 = require("./constants");
+const types_1 = require("./api/types");
 /**
  * Utility to determine if a given IGroup, IItem, IHubContent, or IHubItemEntity
  * is discussable.
@@ -27,4 +28,144 @@ function setDiscussableKeyword(typeKeywords, discussable) {
     return updatedTypeKeywords;
 }
 exports.setDiscussableKeyword = setDiscussableKeyword;
+/**
+ * Determines if the given channel is considered to be a `public` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `public`
+ */
+function isPublicChannel(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.some(({ category }) => category === types_1.AclCategory.AUTHENTICATED_USER)
+        : channel.access === types_1.SharingAccess.PUBLIC;
+}
+exports.isPublicChannel = isPublicChannel;
+/**
+ * Determines if the given channel is considered to be an `org` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `org`
+ */
+function isOrgChannel(channel) {
+    return channel.channelAcl
+        ? !isPublicChannel(channel) &&
+            channel.channelAcl.some(({ category, subCategory }) => category === types_1.AclCategory.ORG &&
+                subCategory === types_1.AclSubCategory.MEMBER)
+        : channel.access === types_1.SharingAccess.ORG;
+}
+exports.isOrgChannel = isOrgChannel;
+/**
+ * Determines if the given channel is considered to be a `private` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `private`
+ */
+function isPrivateChannel(channel) {
+    return !isPublicChannel(channel) && !isOrgChannel(channel);
+}
+exports.isPrivateChannel = isPrivateChannel;
+/**
+ * Determines the given channel's access, supporting both legacy permissions and V2 ACL
+ * model.
+ * @param channel An IChannel record
+ * @returns `public`, `org` or `private`
+ */
+function getChannelAccess(channel) {
+    let access = types_1.SharingAccess.PRIVATE;
+    if (isPublicChannel(channel)) {
+        access = types_1.SharingAccess.PUBLIC;
+    }
+    else if (isOrgChannel(channel)) {
+        access = types_1.SharingAccess.ORG;
+    }
+    return access;
+}
+exports.getChannelAccess = getChannelAccess;
+/**
+ * Returns an array of org ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of org ids for the given channel
+ */
+function getChannelOrgIds(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.reduce((acc, permission) => permission.category === types_1.AclCategory.ORG &&
+            permission.subCategory === types_1.AclSubCategory.MEMBER
+            ? [...acc, permission.key]
+            : acc, [])
+        : channel.orgs;
+}
+exports.getChannelOrgIds = getChannelOrgIds;
+/**
+ * Returns an array of group ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of group ids for the given channel
+ */
+function getChannelGroupIds(channel) {
+    return channel.channelAcl
+        ? channel.channelAcl.reduce((acc, permission) => permission.category === types_1.AclCategory.GROUP &&
+            permission.subCategory === types_1.AclSubCategory.MEMBER
+            ? [...acc, permission.key]
+            : acc, [])
+        : channel.groups;
+}
+exports.getChannelGroupIds = getChannelGroupIds;
+/**
+ * A utility method used to build an IQuery to search for users that are permitted to be at-mentioned for the given channel.
+ * @param input An array of strings to search for. Each string is mapped to `username` and `fullname`, filters as an OR condition
+ * @param channel An IChannel record
+ * @param currentUsername The currently authenticated user's username
+ * @param options An IHubSearchOptions object
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult>
+ */
+function getChannelUsersQuery(inputs, channel, currentUsername) {
+    const groupIds = getChannelGroupIds(channel);
+    const orgIds = getChannelOrgIds(channel);
+    const groupsPredicate = { group: groupIds };
+    let filters;
+    if (isPublicChannel(channel)) {
+        filters = [
+            {
+                operation: "OR",
+                predicates: [{ orgid: { from: "0", to: "{" } }],
+            },
+        ];
+    }
+    else if (isOrgChannel(channel)) {
+        const additional = groupIds.length ? [groupsPredicate] : [];
+        filters = [
+            {
+                operation: "OR",
+                predicates: [{ orgid: orgIds }, ...additional],
+            },
+        ];
+    }
+    else {
+        filters = [
+            {
+                operation: "AND",
+                predicates: [groupsPredicate],
+            },
+        ];
+    }
+    if (currentUsername) {
+        filters.push({
+            operation: "AND",
+            predicates: [{ username: { not: currentUsername } }],
+        });
+    }
+    const query = {
+        targetEntity: "communityUser",
+        filters: [
+            {
+                operation: "OR",
+                predicates: inputs.reduce((acc, input) => [...acc, { username: input }, { fullname: input }], []),
+            },
+            ...filters,
+        ],
+    };
+    return query;
+}
+exports.getChannelUsersQuery = getChannelUsersQuery;
 //# sourceMappingURL=utils.js.map

package/dist/node/discussions/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":";;;AAEA,2CAA6C;AAK7C;;;;;GAKG;AACH,SAAgB,aAAa,CAC3B,OAA+D;;IAE/D,OAAO,CAAC,OAAC,OAAO,CAAC,YAAY,mCAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,0BAAc,CAAC,CAAC;AAChE,CAAC;AAJD,sCAIC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CACnC,YAAsB,EACtB,WAAoB;IAEpB,MAAM,mBAAmB,GAAG,YAAY,CAAC,MAAM,CAC7C,CAAC,WAAmB,EAAE,EAAE,CAAC,WAAW,KAAK,0BAAc,CACxD,CAAC;IACF,IAAI,CAAC,WAAW,EAAE;QAChB,mBAAmB,CAAC,IAAI,CAAC,0BAAc,CAAC,CAAC;KAC1C;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAXD,sDAWC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":"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"}

package/dist/node/search/_internal/portalSearchGroupMembers.js

@@ -161,6 +161,6 @@ async function memberToSearchResult(member, include = [], requestOptions) {
             objects_1.setProp(key, fetchedUser[key], user);
         }
     });
-    return users_1.enrichUserSearchResult(user, include, requestOptions);
+    return users_1.enrichUserSearchResult(user, ["org.name as OrgName", ...include], requestOptions);
 }
 //# sourceMappingURL=portalSearchGroupMembers.js.map

package/dist/node/search/_internal/portalSearchGroupMembers.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":";;;AAAA,wEAAqE;AAOrE,iEAKkC;AAClC,uDAAoD;AACpD,oCAA2C;AAC3C,6CAAsC;AAEtC,uCAAqD;AACrD,uCAAuC;AACvC,2CAA4D;AAE5D;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,wBAAwB,CAC5C,KAAa,EACb,OAA0B;IAE1B,+DAA+D;IAC/D,IAAI,OAAe,CAAC;IACpB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/B,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvB,6BAA6B;gBAC7B,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;aACnB;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACnC,4BAA4B;gBAC5B,OAAO,GAAG,IAAI,CAAC;aAChB;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACnC,gCAAgC;gBAChC,wCAAwC;gBACxC,OAAO,GAAG,iBAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,iBAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC9D;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,kBAAQ,CAChB,0BAA0B,EAC1B,6DAA6D,CAC9D,CAAC;KACH;IAED,kDAAkD;IAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC3C,uDAAuD;QACvD,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,2BAA2B;YAC3B,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;gBAChB,OAAO,CAAC,CAAC,IAAI,CAAC;aACf;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC;YACF,wCAAwC;aACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO,mBAAS,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC1C,CAAC,CAAC;YACF,8BAA8B;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACtC,CAAC,CAAC;YACF,kCAAkC;aACjC,GAAG,CAAC,iCAAe,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,MAAM,EAAE,GAAG,iDAAuB,CAAC,KAAK,CAAC,CAAC;IAC1C,mFAAmF;IACnF,MAAM,KAAK,GAAmC;QAC5C,KAAK;QACL,WAAW;QACX,WAAW;QACX,SAAS;QACT,OAAO;KACR,CAAC;IACF,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,EAAE,CAAC,IAAsC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5D;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,OAAO,GAAG,OAAO,CAAC;IACrB,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAE3C,iBAAiB;IACjB,OAAO,kBAAkB,CAAC,EAA8B,CAAC,CAAC;AAC5D,CAAC;AA9ED,4DA8EC;AAED;;;;GAIG;AACH,KAAK,UAAU,kBAAkB,CAC/B,aAAuC;IAEvC,iEAAiE;IACjE,MAAM,IAAI,GAAG,gCACR,aAAa,GACb,aAAa,CAAC,cAAc,CACJ,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,qCAAgB,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEjE,qCAAqC;IACrC,uCAAuC;IACvC,MAAM,EAAE,GAAG,CAAC,MAAoB,EAAE,EAAE;QAClC,OAAO,oBAAoB,iCACpB,MAAM,KAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,KAClE,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACJ,CAAC,CAAC;IAEF,mBAAmB;IACnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO;QACP,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAC5B,IAAI,EAAE,uBAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,kBAAkB,CACnB;KACF,CAAC;AACJ,CAAC;AAgBD;;;;;;;;GAQG;AACH,KAAK,UAAU,oBAAoB,CACjC,MAAgD,EAChD,UAAoB,EAAE,EACtB,cAAmC;IAEnC,mDAAmD;IACnD,yDAAyD;IACzD,MAAM,IAAI,GAAgC;QACxC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,QAAQ;QACzC,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAQ,CAAC,4BAAO,EAAE,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,cAAc,EAAE,cAAc,CAAC,cAAc;QAC7C,MAAM,EAAE,cAAc,CAAC,MAAM;KAC9B,CAAC,CAAC;IACH,iDAAiD;IACjD,mFAAmF;IACnF,2EAA2E;IAC3E,oBAAoB;IACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YAC9D,iBAAO,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;SACtC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,8BAAsB,CAC3B,IAAI,EACJ,CAAC,qBAAqB,EAAE,GAAG,OAAO,CAAC,EACnC,cAAc,CACf,CAAC;AACJ,CAAC"}

package/dist/node/search/_internal/portalSearchUsers.js

@@ -1,34 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.portalSearchUsers = void 0;
+exports.searchCommunityUsers = exports.searchPortalUsers = exports.searchPortalUsersLegacy = void 0;
 const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
 const users_1 = require("../../users");
 const serializeQueryForPortal_1 = require("../serializeQueryForPortal");
 const HubError_1 = require("../../HubError");
 const utils_1 = require("../utils");
 const expandPredicate_1 = require("./expandPredicate");
-/**
- * @private
- * Portal Search Implementation for Users
- * @param filterGroups
- * @param options
- * @returns
- */
-async function portalSearchUsers(query, options) {
+const util_1 = require("../../util");
+function buildSearchOptions(query, options, operation) {
     // requestOptions is always required and user must be authd
     if (!options.requestOptions) {
-        throw new HubError_1.default("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
+        throw new HubError_1.default(operation, "requestOptions: IHubRequestOptions is required.");
     }
     if (!options.requestOptions.authentication) {
-        throw new HubError_1.default("portalSearchUsers", "requestOptions must pass authentication.");
+        throw new HubError_1.default(operation, "requestOptions must pass authentication.");
     }
+    const clonedQuery = util_1.cloneObject(query);
     // Expand the individual predicates in each filter
-    query.filters = query.filters.map((filter) => {
+    clonedQuery.filters = clonedQuery.filters.map((filter) => {
         filter.predicates = filter.predicates.map(expandPredicate_1.expandPredicate);
         return filter;
     });
     // Serialize the all the groups for portal
-    const so = serializeQueryForPortal_1.serializeQueryForPortal(query);
+    const so = serializeQueryForPortal_1.serializeQueryForPortal(clonedQuery);
     // Array of properties we want to copy from IHubSearchOptions to the ISearchOptions
     const props = [
         "num",
@@ -47,27 +42,99 @@ async function portalSearchUsers(query, options) {
     // Unlike Groups and Item, the Users api *requires* authentication
     // so we set it directly
     so.authentication = options.requestOptions.authentication;
+    return so;
+}
+/**
+ * @private
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * Automatically adds "org.name as OrgName" enrichment
+ *
+ * DEPRECATED: This method will be deprecated in a future release, as it's not ideal to impose default enrichments in all
+ * cases. When this method is depreated, all places that currently call `hubSearch` with a `targetEntity` of `user` will
+ * need to be updated to use the `portalUser` `targetEntity` and explicitly pass `"org.name as OrgName"` in `inclues` to
+ * preserve that enrichment, if needed. E.g.
+ *
+ * ```js
+ * // before
+ * await hubSearch(
+ *   { targetEntity: "user", ... },
+ *   { start: 1, ... },
+ * );
+ *
+ * // after
+ * await hubSearch(
+ *   { targetEntity: "portalUser", ... },
+ *   { start: 1, include: ["org.name as OrgName", ...], ... },
+ * );
+ * ```
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+function searchPortalUsersLegacy(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchPortalUsersLegacy");
+    // Execute search
+    return searchPortal(Object.assign(Object.assign({}, searchOptions), { include: ["org.name as OrgName", ...(searchOptions.include || [])] }));
+}
+exports.searchPortalUsersLegacy = searchPortalUsersLegacy;
+/**
+ * @private
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+function searchPortalUsers(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchPortalUsers");
+    // Execute search
+    return searchPortal(searchOptions);
+}
+exports.searchPortalUsers = searchPortalUsers;
+/**
+ * @private
+ *
+ * Community Search Implementation for Users within in any organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+function searchCommunityUsers(query, options) {
+    const searchOptions = buildSearchOptions(query, options, "searchCommunityUsers");
     // Execute search
-    return searchPortal(so);
+    return searchCommunity(searchOptions);
+}
+exports.searchCommunityUsers = searchCommunityUsers;
+/**
+ * @private
+ * @param searchOptions An IUserSearchOptions object
+ * @param searchResponse A ISearchResult<IUser> object
+ * @returns
+ */
+function mapUsersToSearchResults(searchOptions, searchResponse) {
+    // create mappable fn that will close
+    // over the includes and requestOptions
+    const fn = (user) => userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
+    return Promise.all(searchResponse.results.map(fn));
 }
-exports.portalSearchUsers = portalSearchUsers;
 /**
  * Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
  * handling enrichments & includes along the way
  *
  * @param searchOptions
- * @returns
+ * @returns a promise that resolves enriched internal portal user search results
  */
 async function searchPortal(searchOptions) {
     // Execute portal search
     const resp = await arcgis_rest_portal_1.searchUsers(searchOptions);
-    // create mappable fn that will close
-    // over the includes and requestOptions
-    const fn = (user) => {
-        return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
-    };
     // map over results
-    const results = await Promise.all(resp.results.map(fn));
+    const results = await mapUsersToSearchResults(searchOptions, resp);
     // Group Search does not support aggregations
     // Construct the return
     return {
@@ -77,6 +144,27 @@ async function searchPortal(searchOptions) {
         next: utils_1.getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
     };
 }
+/**
+ * Community search, which then converts `IGroup`s to `IHubSearchResult`s
+ * handling enrichments & includes along the way
+ *
+ * @param searchOptions
+ * @returns a promise that resolves enriched community user search results
+ */
+async function searchCommunity(searchOptions) {
+    // Execute portal search
+    const resp = await arcgis_rest_portal_1.searchCommunityUsers(searchOptions);
+    // map over results
+    const results = await mapUsersToSearchResults(searchOptions, resp);
+    // Group Search does not support aggregations
+    // Construct the return
+    return {
+        total: resp.total,
+        results,
+        hasNext: resp.nextStart > -1,
+        next: utils_1.getNextFunction(searchOptions, resp.nextStart, resp.total, searchCommunity),
+    };
+}
 /**
  * Convert an Item to a IHubSearchResult
  * Fetches the includes and attaches them to the item
@@ -85,7 +173,7 @@ async function searchPortal(searchOptions) {
  * @param requestOptions
  * @returns
  */
-async function userToSearchResult(user, include = [], requestOptions) {
+function userToSearchResult(user, include = [], requestOptions) {
     // Delegate to HubUsers module
     // This layer of indirection is not necessary but
     // aligns with how the items search works and

package/dist/node/search/_internal/portalSearchUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":";;;AAAA,iEAIkC;AAElC,uCAAqD;AACrD,wEAAqE;AACrE,6CAAsC;AAQtC,oCAA2C;AAC3C,uDAAoD;AAEpD;;;;;;GAMG;AACI,KAAK,UAAU,iBAAiB,CACrC,KAAa,EACb,OAA0B;IAE1B,2DAA2D;IAC3D,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,mBAAmB,EACnB,iDAAiD,CAClD,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE;QAC1C,MAAM,IAAI,kBAAQ,CAChB,mBAAmB,EACnB,0CAA0C,CAC3C,CAAC;KACH;IAED,kDAAkD;IAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC3C,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,iCAAe,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,MAAM,EAAE,GAAG,iDAAuB,CAAC,KAAK,CAAC,CAAC;IAC1C,mFAAmF;IACnF,MAAM,KAAK,GAAmC;QAC5C,KAAK;QACL,WAAW;QACX,WAAW;QACX,SAAS;QACT,OAAO;QACP,gBAAgB;KACjB,CAAC;IACF,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,EAAE,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAClD;IACH,CAAC,CAAC,CAAC;IAEH,kEAAkE;IAClE,wBAAwB;IACxB,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC;IAE1D,iBAAiB;IACjB,OAAO,YAAY,CAAC,EAAwB,CAAC,CAAC;AAChD,CAAC;AAjDD,8CAiDC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,YAAY,CACzB,aAAiC;IAEjC,wBAAwB;IACxB,MAAM,IAAI,GAAG,MAAM,gCAAW,CAAC,aAAa,CAAC,CAAC;IAE9C,qCAAqC;IACrC,uCAAuC;IACvC,MAAM,EAAE,GAAG,CAAC,IAAW,EAAE,EAAE;QACzB,OAAO,kBAAkB,CACvB,IAAI,EACJ,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACJ,CAAC,CAAC;IAEF,mBAAmB;IACnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAExD,6CAA6C;IAC7C,uBAAuB;IACvB,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO;QACP,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAC5B,IAAI,EAAE,uBAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,YAAY,CACb;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,kBAAkB,CAC/B,IAAW,EACX,UAAoB,EAAE,EACtB,cAAmC;IAEnC,8BAA8B;IAC9B,iDAAiD;IACjD,6CAA6C;IAC7C,mCAAmC;IACnC,OAAO,8BAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":"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"}

package/dist/node/search/hubSearch.js

@@ -53,7 +53,9 @@ async function hubSearch(query, options) {
         arcgis: {
             item: portalSearchItems_1.portalSearchItems,
             group: portalSearchGroups_1.portalSearchGroups,
-            user: portalSearchUsers_1.portalSearchUsers,
+            user: portalSearchUsers_1.searchPortalUsersLegacy,
+            portalUser: portalSearchUsers_1.searchPortalUsers,
+            communityUser: portalSearchUsers_1.searchCommunityUsers,
             groupMember: portalSearchGroupMembers_1.portalSearchGroupMembers,
         },
         "arcgis-hub": {

package/dist/node/search/hubSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAOtC,6DAA0D;AAE1D,mFAAgF;AAChF,qEAAkE;AAClE,uEAAoE;AACpE,qEAAkE;AAClE,+DAA4D;AAC5D,qEAAkE;AAElE;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC9C,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,yDAAyD,CAC1D,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,8EAA8E;IAC9E,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,kBAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,kBAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,qCAAiB;YACvB,KAAK,EAAE,uCAAkB;YACzB,IAAI,EAAE,qCAAiB;YACvB,WAAW,EAAE,mDAAwB;SACtC;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,+BAAc;YACpB,OAAO,EAAE,qCAAiB;SAC3B;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC;AAlED,8BAkEC"}
+{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAOtC,6DAA0D;AAC1D,mFAAgF;AAChF,qEAAkE;AAClE,uEAAoE;AACpE,qEAAiH;AACjH,+DAA4D;AAC5D,qEAAkE;AAElE;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC9C,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,yDAAyD,CAC1D,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,8EAA8E;IAC9E,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,kBAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,kBAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,qCAAiB;YACvB,KAAK,EAAE,uCAAkB;YACzB,IAAI,EAAE,2CAAuB;YAC7B,UAAU,EAAE,qCAAiB;YAC7B,aAAa,EAAE,wCAAoB;YACnC,WAAW,EAAE,mDAAwB;SACtC;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,+BAAc;YACpB,OAAO,EAAE,qCAAiB;SAC3B;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC;AApED,8BAoEC"}

package/dist/node/search/serializeQueryForPortal.js

@@ -145,8 +145,8 @@ function serializePredicate(predicate) {
             if (!specialProps.includes(key) && key !== "term") {
                 so.q = serializeMatchOptions(key, value);
             }
-            if (dateProps.includes(key)) {
-                so.q = serializeDateRange(key, value);
+            if (dateProps.includes(key) || isRange(value)) {
+                so.q = serializeRange(key, value);
             }
             if (boolProps.includes(key)) {
                 so.q = `${key}:${value}`;
@@ -206,12 +206,12 @@ function serializeMatchOptions(key, value) {
     return result;
 }
 /**
- * Serialize a date-range into Portal syntax
+ * Serialize a range into Portal syntax
  * @param key
  * @param range
  * @returns
  */
-function serializeDateRange(key, range) {
+function serializeRange(key, range) {
     return `${key}:[${range.from} TO ${range.to}]`;
 }
 /**
@@ -234,4 +234,14 @@ function serializeStringOrArray(join, key, value) {
     }
     return q;
 }
+/**
+ * Determines if the given value is a range object
+ * @param value A search param value
+ * @returns true when the value is a range object, e.g. { from: '0', to: '{' }
+ */
+function isRange(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        ["from", "to"].every((key) => typeof value[key] !== "undefined"));
+}
 //# sourceMappingURL=serializeQueryForPortal.js.map

package/dist/node/search/serializeQueryForPortal.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"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"}

package/dist/node/users/HubUsers.js

@@ -50,14 +50,8 @@ async function enrichUserSearchResult(user, include, requestOptions) {
         result.memberType = user.memberType;
         result.isGroupOwner = user.isGroupOwner;
     }
-    // Informal Enrichments - basically adding type-specific props
-    // derived directly from the entity
-    // default includes
-    const DEFAULTS = ["org.name AS orgName"];
-    // merge includes
-    include = [...DEFAULTS, ...include].filter(util_1.unique);
     // Parse the includes into a valid set of enrichments
-    const specs = include.map(parseInclude_1.parseInclude);
+    const specs = include.filter(util_1.unique).map(parseInclude_1.parseInclude);
     // Extract out the low-level enrichments needed
     const enrichments = utils_2.mapBy("enrichment", specs).filter(util_1.unique);
     // fetch the enrichments

package/dist/node/users/HubUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":";;;AACA,yDAA+D;AAC/D,wCAAqC;AACrC,2CAAsD;AACtD,mEAAgE;AAEhE,kCAAyC;AACzC,kCAAiC;AACjC,oCAAiC;AAIjC;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,IAAiC,EACjC,OAAiB,EACjB,cAAkC;;IAElC,6BAA6B;IAC7B,MAAM,MAAM,GAAqB;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAqB;QAClC,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,MAAM;QACZ;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,KAAK,EAAE,IAAI,CAAC,QAAQ;QACpB,yDAAyD;QACzD,4FAA4F;QAC5F,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAC1E,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,iBAAiB,EAAE,cAAc;QACjC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,iBAAiB,EAAE,eAAe;QAClC,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE;YACL,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,IAAI;SAChB;KACF,CAAC;IACF,qDAAqD;IACrD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;KACzC;IAED,8DAA8D;IAC9D,mCAAmC;IAEnC,mBAAmB;IACnB,MAAM,QAAQ,GAAa,CAAC,qBAAqB,CAAC,CAAC;IAEnD,iBAAiB;IACjB,OAAO,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC;IACnD,qDAAqD;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,2BAAY,CAAC,CAAC;IACxC,+CAA+C;IAC/C,MAAM,WAAW,GAAG,aAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC;IAC9D,wBAAwB;IACxB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,6EAA6E;IAC7E,2DAA2D;IAC3D,0BAA0B;IAC1B,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,QAAQ,GAAG,MAAM,kCAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;KAC1E;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,SAAG,cAAc,CAAC,cAAc,0CAAE,KAAK,CAAC;IAEnD,4DAA4D;IAC5D,qDAAqD;IACrD,IAAI,IAAI,CAAC,SAAS,EAAE;QAClB,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,2BAAmB,CAC1C,cAAc,CAAC,MAAM,EACrB,IAAI,EACJ,KAAK,CACN,CAAC;KACH;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,qBAAc,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE,CAAC;IAEnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhFD,wDAgFC"}
+{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":";;;AACA,yDAA+D;AAC/D,wCAAqC;AACrC,2CAAsD;AACtD,mEAAgE;AAEhE,kCAAyC;AACzC,kCAAiC;AACjC,oCAAiC;AAIjC;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,IAAiC,EACjC,OAAiB,EACjB,cAAkC;;IAElC,6BAA6B;IAC7B,MAAM,MAAM,GAAqB;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAqB;QAClC,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,MAAM;QACZ;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,KAAK,EAAE,IAAI,CAAC,QAAQ;QACpB,yDAAyD;QACzD,4FAA4F;QAC5F,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAC1E,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,iBAAiB,EAAE,cAAc;QACjC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,iBAAiB,EAAE,eAAe;QAClC,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE;YACL,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,IAAI;SAChB;KACF,CAAC;IACF,qDAAqD;IACrD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;KACzC;IAED,qDAAqD;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC,GAAG,CAAC,2BAAY,CAAC,CAAC;IACvD,+CAA+C;IAC/C,MAAM,WAAW,GAAG,aAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC;IAC9D,wBAAwB;IACxB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,6EAA6E;IAC7E,2DAA2D;IAC3D,0BAA0B;IAC1B,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,QAAQ,GAAG,MAAM,kCAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;KAC1E;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,SAAG,cAAc,CAAC,cAAc,0CAAE,KAAK,CAAC;IAEnD,4DAA4D;IAC5D,qDAAqD;IACrD,IAAI,IAAI,CAAC,SAAS,EAAE;QAClB,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,2BAAmB,CAC1C,cAAc,CAAC,MAAM,EACrB,IAAI,EACJ,KAAK,CACN,CAAC;KACH;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,qBAAc,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE,CAAC;IAEnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAxED,wDAwEC"}

package/dist/types/discussions/utils.d.ts

@@ -1,5 +1,7 @@
 import { IGroup, IItem } from "@esri/arcgis-rest-types";
 import { IHubContent, IHubItemEntity } from "../core";
+import { IChannel, SharingAccess } from "./api/types";
+import { IQuery } from "../search";
 /**
  * Utility to determine if a given IGroup, IItem, IHubContent, or IHubItemEntity
  * is discussable.
@@ -14,3 +16,54 @@ export declare function isDiscussable(subject: Partial<IGroup | IItem | IHubCont
  * @returns {string[]} updated list of type keywords
  */
 export declare function setDiscussableKeyword(typeKeywords: string[], discussable: boolean): string[];
+/**
+ * Determines if the given channel is considered to be a `public` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `public`
+ */
+export declare function isPublicChannel(channel: IChannel): boolean;
+/**
+ * Determines if the given channel is considered to be an `org` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `org`
+ */
+export declare function isOrgChannel(channel: IChannel): boolean;
+/**
+ * Determines if the given channel is considered to be a `private` channel, supporting both
+ * legacy permissions and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns true if the channel is considered `private`
+ */
+export declare function isPrivateChannel(channel: IChannel): boolean;
+/**
+ * Determines the given channel's access, supporting both legacy permissions and V2 ACL
+ * model.
+ * @param channel An IChannel record
+ * @returns `public`, `org` or `private`
+ */
+export declare function getChannelAccess(channel: IChannel): SharingAccess;
+/**
+ * Returns an array of org ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of org ids for the given channel
+ */
+export declare function getChannelOrgIds(channel: IChannel): string[];
+/**
+ * Returns an array of group ids configured for the channel, supporting both legacy permissions
+ * and V2 ACL model.
+ * @param channel An IChannel record
+ * @returns an array of group ids for the given channel
+ */
+export declare function getChannelGroupIds(channel: IChannel): string[];
+/**
+ * A utility method used to build an IQuery to search for users that are permitted to be at-mentioned for the given channel.
+ * @param input An array of strings to search for. Each string is mapped to `username` and `fullname`, filters as an OR condition
+ * @param channel An IChannel record
+ * @param currentUsername The currently authenticated user's username
+ * @param options An IHubSearchOptions object
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult>
+ */
+export declare function getChannelUsersQuery(inputs: string[], channel: IChannel, currentUsername?: string): IQuery;

package/dist/types/search/_internal/portalSearchUsers.d.ts

@@ -1,9 +1,53 @@
 import { IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IQuery } from "../types";
 /**
  * @private
- * Portal Search Implementation for Users
- * @param filterGroups
- * @param options
- * @returns
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * Automatically adds "org.name as OrgName" enrichment
+ *
+ * DEPRECATED: This method will be deprecated in a future release, as it's not ideal to impose default enrichments in all
+ * cases. When this method is depreated, all places that currently call `hubSearch` with a `targetEntity` of `user` will
+ * need to be updated to use the `portalUser` `targetEntity` and explicitly pass `"org.name as OrgName"` in `inclues` to
+ * preserve that enrichment, if needed. E.g.
+ *
+ * ```js
+ * // before
+ * await hubSearch(
+ *   { targetEntity: "user", ... },
+ *   { start: 1, ... },
+ * );
+ *
+ * // after
+ * await hubSearch(
+ *   { targetEntity: "portalUser", ... },
+ *   { start: 1, include: ["org.name as OrgName", ...], ... },
+ * );
+ * ```
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
  */
-export declare function portalSearchUsers(query: IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+export declare function searchPortalUsersLegacy(query: IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+/**
+ * @private
+ *
+ * Portal Search Implementation for Users within the currently authenticated user's organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+export declare function searchPortalUsers(query: IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+/**
+ * @private
+ *
+ * Community Search Implementation for Users within in any organization.
+ * No enrichments added by default.
+ *
+ * @param query An IQuery object representing the query to serialize
+ * @param options An IHubSearchOptions of search options
+ * @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
+ */
+export declare function searchCommunityUsers(query: IQuery, options: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;

package/dist/types/search/types/IHubCatalog.d.ts

@@ -50,7 +50,7 @@ export interface IHubCollection {
      */
     targetEntity: EntityType;
 }
-export declare type EntityType = "item" | "group" | "user" | "groupMember" | "event" | "channel";
+export declare type EntityType = "item" | "group" | "user" | "portalUser" | "communityUser" | "groupMember" | "event" | "channel";
 /**
  * @private
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/hub-common",
-  "version": "14.20.0",
+  "version": "14.21.0",
   "description": "Common TypeScript types and utility functions for @esri/hub.js.",
   "main": "dist/node/index.js",
   "module": "dist/esm/index.js",