@esri/hub-common 10.0.0-next.1 → 10.0.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/hub-common",
-  "version": "10.0.0-next.1",
+  "version": "10.0.0-next.2",
   "description": "Common TypeScript types and utility functions for @esri/hub.js.",
   "main": "dist/node/index.js",
   "unpkg": "dist/umd/common.umd.js",

package/dist/es2017/search/_searchContent.js

@@ -1,112 +0,0 @@
-import { expandContentFilter, serializeContentFilterForPortal, } from "./content-utils";
-import { searchItems } from "@esri/arcgis-rest-portal";
-import { expandApi, getNextFunction } from "./utils";
-import { getItemThumbnailUrl, itemToContent, setContentSiteUrls, } from "..";
-import { Logger } from "../utils";
-// TODO: Remove with _searchContent
-/**
- * @private
- * Search for content via the Portal or Hub API
- * @param filter
- * @param options
- */
-export async function _searchContent(filter, options) {
-    var _a, _b;
-    Logger.warn(`DEPRECATION: _searchContent will be removed; switch to hubSearch(...)`);
-    // expand filter so we can serialize to either api
-    const expanded = expandContentFilter(filter);
-    // API
-    const api = expandApi(options.api || "arcgis");
-    let searchPromise;
-    // Portal Search
-    if (api.type === "arcgis") {
-        // serialize for portal
-        const so = serializeContentFilterForPortal(expanded);
-        // Array of properties we want to copy from IHubSearchOptions
-        // to the ISearchOptions
-        const props = [
-            "authentication",
-            "num",
-            "sortField",
-            "sortOrder",
-            "site",
-            "start",
-        ];
-        // copy the props over
-        props.forEach((prop) => {
-            if (options.hasOwnProperty(prop)) {
-                so[prop] = options[prop];
-            }
-        });
-        // If we don't have auth, ensure we have .portal
-        if (!so.authentication) {
-            so.portal = `${api.url}/sharing/rest`;
-        }
-        // DEPRECATION
-        if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
-            // tslint:disable-next-line:no-console
-            console.warn(`IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.`);
-            so.countFields = options.aggregations.join(",");
-            so.countSize = options.aggLimit || 10;
-        }
-        // Aggregations
-        if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
-            so.countFields = options.aggFields.join(",");
-            so.countSize = options.aggLimit || 10;
-        }
-        searchPromise = searchPortal(so);
-    }
-    else {
-        // Hub API Search
-        // TODO: Implement hub api content search
-        searchPromise = Promise.resolve({
-            total: 0,
-            results: [],
-            hasNext: false,
-            next: () => {
-                // tslint:disable-next-line
-                Promise.resolve(null);
-            },
-        });
-    }
-    return searchPromise;
-}
-/**
- * Internal portal search, which then converts items to Content, and
- * if a Site was passed, also sets urls
- *
- * @param searchOptions
- * @param site
- * @returns
- */
-function searchPortal(searchOptions) {
-    var _a;
-    const portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) || searchOptions.portal;
-    let token;
-    if (searchOptions.authentication) {
-        const us = searchOptions.authentication;
-        token = us.token;
-    }
-    const thumbnailify = (content) => {
-        content.thumbnailUrl = getItemThumbnailUrl(content, portalUrl, token);
-        return content;
-    };
-    return searchItems(searchOptions).then((resp) => {
-        const hasNext = resp.nextStart > -1;
-        // convert items to IHubContent's
-        let content = resp.results.map(itemToContent);
-        // if we have a site, add those urls
-        if (searchOptions.site) {
-            content = content.map((entry) => setContentSiteUrls(entry, searchOptions.site));
-        }
-        // add thumbnailUrl
-        content = content.map(thumbnailify);
-        return {
-            total: resp.total,
-            results: content,
-            hasNext,
-            next: getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
-        };
-    });
-}
-//# sourceMappingURL=_searchContent.js.map

package/dist/es2017/search/_searchContent.js.map

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

package/dist/es2017/search/_searchGroups.js

@@ -1,88 +0,0 @@
-import { searchGroups as portalGroupSearch } from "@esri/arcgis-rest-portal";
-import { expandApi, getNextFunction } from ".";
-import { expandGroupFilter, serializeGroupFilterForPortal, } from "./group-utils";
-import { getGroupThumbnailUrl, Logger } from "..";
-// TODO: Remove with _searchContent
-/**
- * @private
- * Search Groups using Filter<"group">
- *
- * Currently just returns ISearchResult<IGroup>
- * @param filter
- * @param options
- * @returns
- */
-export async function _searchGroups(filter, options) {
-    Logger.warn(`DEPRECATION: _searchGroups will be removed; switch to hubSearch(...)`);
-    // expand filter so we can serialize to either api
-    const expanded = expandGroupFilter(filter);
-    // API
-    const api = expandApi(options.api || "arcgis");
-    if (api.type === "arcgis") {
-        const so = serializeGroupFilterForPortal(expanded);
-        // Array of properties we want to copy from IHubSearchOptions
-        // to the ISearchOptions
-        const props = [
-            "authentication",
-            "num",
-            "sortField",
-            "sortOrder",
-            "site",
-            "start",
-        ];
-        // copy the props over
-        props.forEach((prop) => {
-            if (options.hasOwnProperty(prop)) {
-                so[prop] = options[prop];
-            }
-        });
-        // If we don't have auth, ensure we have .portal
-        if (!so.authentication) {
-            so.portal = `${api.url}/sharing/rest`;
-        }
-        return searchPortalGroups(so);
-    }
-    else {
-        throw new Error("_searchGroups is not implemented for non-arcgis apis");
-    }
-}
-/**
- * Internal function that searches for groups using the ArcGIS Portal API
- * @param searchOptions
- * @returns
- */
-function searchPortalGroups(searchOptions) {
-    var _a;
-    const teamLinkify = (group) => {
-        group.siteTeamUrl = `${searchOptions.site.item.url}/teams/${group.id}/about`;
-        return group;
-    };
-    const portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) || searchOptions.portal;
-    let token;
-    if (searchOptions.authentication) {
-        const us = searchOptions.authentication;
-        token = us.token;
-    }
-    const thumbnailify = (group) => {
-        group.thumbnailUrl = getGroupThumbnailUrl(portalUrl, group, token);
-        return group;
-    };
-    // execute the search
-    return portalGroupSearch(searchOptions).then((response) => {
-        var _a, _b;
-        const hasNext = response.nextStart > -1;
-        // upgrade thumbnail url
-        let results = response.results.map(thumbnailify);
-        // generate the site team url if site url is provided
-        if ((_b = (_a = searchOptions.site) === null || _a === void 0 ? void 0 : _a.item) === null || _b === void 0 ? void 0 : _b.url) {
-            results = response.results.map(teamLinkify);
-        }
-        return {
-            hasNext,
-            total: response.total,
-            results,
-            next: getNextFunction(searchOptions, response.nextStart, response.total, searchPortalGroups),
-        };
-    });
-}
-//# sourceMappingURL=_searchGroups.js.map

package/dist/es2017/search/_searchGroups.js.map

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

package/dist/es2017/search/_searchUsers.js

@@ -1,89 +0,0 @@
-import { expandApi, expandUserFilter, getNextFunction, getUserThumbnailUrl, Logger, serializeUserFilterForPortal, } from "..";
-import { searchUsers as portalUserSearch, } from "@esri/arcgis-rest-portal";
-// TODO: Remove with _searchContent
-/**
- * @private
- * Search for Users via the Portal API.
- *
- * **Note** Authentication is required
- *
- * Another trivial comment to force a release
- *
- * Note: in the future, there may be options to search via
- * a Hub specific API
- * @param filter
- * @param options
- * @returns
- */
-export async function _searchUsers(filter, options) {
-    Logger.warn(`DEPRECATION: _searchUsers will be removed; switch to hubSearch(...)`);
-    // JS Clients may not pass in authentication
-    if (!options.authentication) {
-        throw new Error("Authentication required to search for users.");
-    }
-    // expand filter so we can serialize to either api
-    const expanded = expandUserFilter(filter);
-    // API
-    const api = expandApi(options.api || "arcgis");
-    if (api.type === "arcgis") {
-        const searchOptions = serializeUserFilterForPortal(expanded);
-        // Array of properties we want to copy from IHubSearchOptions
-        // to the ISearchOptions
-        const props = [
-            "authentication",
-            "num",
-            "sortField",
-            "sortOrder",
-            "site",
-            "start",
-        ];
-        // copy the props over
-        props.forEach((prop) => {
-            if (options.hasOwnProperty(prop)) {
-                searchOptions[prop] = options[prop];
-            }
-        });
-        return searchPortalUsers(searchOptions);
-    }
-    else {
-        throw new Error("_searchUsers is not implemented for non-arcgis apis");
-    }
-}
-/**
- * Internal function that executes the user search along with
- * some simple enrichments
- * @param searchOptions
- * @returns
- */
-function searchPortalUsers(searchOptions) {
-    const portalUrl = searchOptions.authentication.portal;
-    const token = searchOptions.authentication.token;
-    // Partially applied functions for mapping over the results
-    const userLinkify = (user) => {
-        user.profileUrl = `${searchOptions.site.item.url}/people/${user.username}/profile`;
-        return user;
-    };
-    const thumbnailify = (user) => {
-        if (user.thumbnail) {
-            user.thumbnailUrl = getUserThumbnailUrl(portalUrl, user, token);
-        }
-        return user;
-    };
-    return portalUserSearch(searchOptions).then((response) => {
-        var _a, _b;
-        const hasNext = response.nextStart > -1;
-        // upgrade thumbnail url
-        let results = response.results.map(thumbnailify);
-        // generate the site team url if site url is provided
-        if ((_b = (_a = searchOptions.site) === null || _a === void 0 ? void 0 : _a.item) === null || _b === void 0 ? void 0 : _b.url) {
-            results = response.results.map(userLinkify);
-        }
-        return {
-            hasNext,
-            total: response.total,
-            results,
-            next: getNextFunction(searchOptions, response.nextStart, response.total, searchPortalUsers),
-        };
-    });
-}
-//# sourceMappingURL=_searchUsers.js.map

package/dist/es2017/search/_searchUsers.js.map

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