@esri/hub-common 9.25.0 → 9.25.3

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.24.2 - Wed Mar 23 2022 22:47:07 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.25.2 - Wed Mar 30 2022 22:05:13 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -6588,23 +6588,12 @@
         }
         return date && precision && { date: date, precision: precision };
     }
-    /**
-     * Get the spatial reference from layer or server info
-     * @param server
-     * @param layer
-     * @returns
-     * @private
-     */
-    var getServerSpatialReference = function (server, layer) {
-        var _a;
-        var layerSpatialReference = (_a = layer === null || layer === void 0 ? void 0 : layer.extent) === null || _a === void 0 ? void 0 : _a.spatialReference;
-        return layerSpatialReference || (server === null || server === void 0 ? void 0 : server.spatialReference);
-    };
     // NOTE: IItem has spatialRefernce: ISpatialReference, but
     // the portal REST API returns spatialReference as as string
-    // that is always either WKID like "102100" or
-    // WKT like "NAD_1983_HARN_StatePlane_Hawaii_3_FIPS_5103_Feet"
-    // so we coerce those string into a ISpatialReference object
+    // that is always either WKID like "102100" or the name of a
+    // WKT like "NAD_1983_HARN_StatePlane_Hawaii_3_FIPS_5103_Feet".
+    // We only coerce WKIDs into a ISpatialReference objects since we
+    // can't easily lookup a complete WKT.
     /**
      * Get the spatial reference as an object for an item
      * @param item
@@ -6622,8 +6611,9 @@
         var spatialReferenceString = spatialReference + "";
         var wkid = parseInt(spatialReferenceString, 10);
         return isNaN(wkid)
-            ? // string is not a number, assume it is WKT
-                { wkt: spatialReferenceString }
+            ? // It looks like the portal api returns the name of a WKT, but we'd
+                // need to perform a lookup to get the full WKT. Return null for now.
+                null
             : //
                 { wkid: wkid };
     };
@@ -7487,7 +7477,7 @@
                 return name;
             },
             get description() {
-                return searchDescription || _layerDescription || item.description;
+                return _layerDescription || item.description;
             }, type: type, get family() {
                 return getFamily(type);
             }, get url() {
@@ -7534,12 +7524,11 @@
                 return boundary || getContentBoundary(item);
             },
             get summary() {
-                return _layerDescription
-                    ? _layerDescription
-                    : // TODO: this should use the logic for the Hub API's searchDescription
-                        // see: https://github.com/ArcGIS/hub-indexer/blob/b352cfded8221a967ac80447879d493db6476d7a/packages/duke/compose/dataset.js#L238-L250
-                        // TODO: can we strip HTML from description, and do we need to trim it to a X chars?
-                        item.snippet || item.description;
+                return (searchDescription ||
+                    // TODO: this should use the logic for the Hub API's searchDescription
+                    // see: https://github.com/ArcGIS/hub-indexer/blob/b352cfded8221a967ac80447879d493db6476d7a/packages/duke/compose/dataset.js#L238-L250
+                    item.snippet ||
+                    item.description);
             }, urls: urls, get portalHomeUrl() {
                 return urls.portalHome;
             },
@@ -7602,14 +7591,13 @@
             // TODO: is metrics in use?
             get metrics() {
                 return item.properties && item.properties.metrics;
-            },
-            get spatialReference() {
+            }, get spatialReference() {
+                var _a;
                 // NOTE: I had to add || null just so packages/content/test/portal.test.ts would pass
                 // we can remove that when that package is deprecated
-                return (getItemSpatialReference(item) ||
-                    getServerSpatialReference(server, layer) ||
-                    null);
-            }, get viewDefinition() {
+                return (((_a = layer === null || layer === void 0 ? void 0 : layer.extent) === null || _a === void 0 ? void 0 : _a.spatialReference) || getItemSpatialReference(item) || null);
+            },
+            get viewDefinition() {
                 // if this is a layer view and we have the item data
                 // find the definition that corresponds to the current layer
                 var dataLayer = layer &&
@@ -8755,29 +8743,44 @@
     var handleEnrichmentError = function (error, input, opId) {
         var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
         stack.finish(opId, { error: error });
-        var message = typeof error === "string"
-            ? /* istanbul ignore next our tests only throw Error objects */
-                error
-            : error.message;
-        var errors = data.errors || [];
-        errors.push({
-            // NOTE: for now we just return the message and type "Other"
-            // but we could later introspect for HTTP or AGO errors
-            // and/or return the status code if available
-            type: "Other",
-            message: message,
-        });
-        return { data: __assign(__assign({}, data), { errors: errors }), stack: stack, requestOptions: requestOptions };
+        return {
+            data: __assign(__assign({}, data), { errors: getEnrichmentErrors(error, data.errors) }),
+            stack: stack,
+            requestOptions: requestOptions,
+        };
     };
     var enrichmentOperations = {
         groupIds: enrichGroupIds,
         metadata: enrichMetadata,
         ownerUser: enrichOwnerUser,
-        // TOOD: org
         data: enrichData,
         server: enrichServer,
         layers: enrichLayers,
     };
+    /**
+     * convert an error to an enrichment error info format
+     * and optionally append it to an existing array of those
+     * @param error
+     * @param errors an array of existing enrichment error info
+     * @returns a new array of enrichment error info
+     * @private
+     */
+    var getEnrichmentErrors = function (error, errors) {
+        if (errors === void 0) { errors = []; }
+        var message = typeof error === "string"
+            ? /* istanbul ignore next our tests only throw Error objects */
+                error
+            : error.message;
+        return __spreadArrays(errors, [
+            {
+                // NOTE: for now we just return the message and type "Other"
+                // but we could later introspect for HTTP or AGO errors
+                // and/or return the status code if available
+                type: "Other",
+                message: message,
+            },
+        ]);
+    };
     /**
      * Fetch enrichments for an item
      * @param item
@@ -8803,6 +8806,19 @@
         }).then(function (output) { return output.data; });
     };
 
+    /**
+     * concat an array of arrays
+     * excluding any elements of the top level array
+     * that are not actually arrays
+     * @param arrays An array of arrays
+     * @returns concatenated array
+     * @private
+     */
+    var maybeConcat = function (arrays) {
+        var result = [].concat.apply([], arrays.filter(Array.isArray));
+        return result.length ? result : undefined;
+    };
+
     /**
      * remote server error
      */
@@ -8906,7 +8922,9 @@
     // that we fetch from the Hub API, and to optionally filter by slug
     var getHubEnrichmentsOptions = function (requestOptions, slug) {
         var opts = cloneObject$1(requestOptions);
-        opts.params = __assign(__assign({}, opts.params), { "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
+        opts.params = __assign(__assign({}, opts.params), { 
+            // TODO: we should fetch errors too
+            "fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
         if (slug) {
             opts.params["filter[slug]"] = slug;
         }
@@ -8953,13 +8971,21 @@
      * @private
      */
     var fetchHubEnrichmentsById = function (hubId, requestOptions) { return __awaiter(void 0, void 0, void 0, function () {
-        var response;
+        var response, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, hubApiRequest("/datasets/" + hubId, getHubEnrichmentsOptions(requestOptions))];
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, hubApiRequest("/datasets/" + hubId, getHubEnrichmentsOptions(requestOptions))];
                 case 1:
                     response = _a.sent();
                     return [2 /*return*/, getDatasetEnrichments(response.data)];
+                case 2:
+                    e_1 = _a.sent();
+                    // dataset record not found, just log the error
+                    // b/c we can still look up the item and enrichments by id
+                    return [2 /*return*/, { errors: getEnrichmentErrors(e_1) }];
+                case 3: return [2 /*return*/];
             }
         });
     }); };
@@ -8990,8 +9016,9 @@
                     _b.label = 3;
                 case 3:
                     layerEnrichments = _a;
-                    // TODO: merge errors
-                    return [2 /*return*/, __assign(__assign({}, itemAndEnrichments), layerEnrichments)];
+                    return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), { 
+                            // merge error arrays
+                            errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) })];
             }
         });
     }); };
@@ -9011,62 +9038,69 @@
         });
     }); };
     var fetchContentById = function (hubId, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var itemId, _a, item, itemEnrichments, specifiedLayerId, _b, slug, layerId, boundary, extent, searchDescription, statistics, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var itemId, _a, item, itemEnrichments, specifiedLayerId, hubEnrichments, _b, layerId;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     itemId = parseDatasetId(hubId).itemId;
                     return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
                 case 1:
-                    _a = _d.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
+                    _a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
                     specifiedLayerId = options && options.layerId;
                     if (!canUseHubApiForItem(item, options)) return [3 /*break*/, 3];
                     return [4 /*yield*/, fetchHubEnrichmentsById(hubId, options)];
                 case 2:
-                    _c = _d.sent();
+                    _b = _c.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    _c = {};
-                    _d.label = 4;
+                    _b = {};
+                    _c.label = 4;
                 case 4:
-                    _b = _c, slug = _b.slug, layerId = _b.layerId, boundary = _b.boundary, extent = _b.extent, searchDescription = _b.searchDescription, statistics = _b.statistics;
+                    hubEnrichments = _b;
+                    layerId = hubEnrichments.layerId;
                     // return a new content object composed from the item and enrichments we fetched
-                    return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { slug: slug, layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId, boundary: boundary,
-                            extent: extent,
-                            searchDescription: searchDescription,
-                            statistics: statistics }))];
+                    return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { 
+                            // prefer specified layer id if any
+                            layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId, 
+                            // merge error arrays
+                            errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
             }
         });
     }); };
     var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, boundary, extent, searchDescription, statistics;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
                 case 1:
-                    hubEnrichments = _b.sent();
+                    hubEnrichments = _c.sent();
                     itemId = hubEnrichments.itemId;
                     layerId = hubEnrichments.layerId;
                     return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
                 case 2:
-                    _a = _b.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
+                    _a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
                     specifiedLayerId = options && options.layerId;
                     if (!(!isNil(specifiedLayerId) && specifiedLayerId !== layerId)) return [3 /*break*/, 4];
-                    // we fetched Hub enrichments by slug for another dataset,
-                    // most likely for the parent service of this layer,
-                    // we need to fetch them for the specified layer instead
+                    // we fetched Hub enrichments by slug for another record,
+                    // most likely the record for the parent service of this layer,
+                    // so we need to fetch them for the specified layer instead
                     layerId = specifiedLayerId;
+                    _b = [__assign({}, hubEnrichments)];
                     return [4 /*yield*/, fetchHubEnrichmentsById(itemId + "_" + layerId, options)];
                 case 3:
-                    hubEnrichments = _b.sent();
-                    _b.label = 4;
-                case 4:
-                    boundary = hubEnrichments.boundary, extent = hubEnrichments.extent, searchDescription = hubEnrichments.searchDescription, statistics = hubEnrichments.statistics;
-                    // return a new content object composed from the item and enrichments we fetched
-                    return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId, slug: fullyQualifiedSlug, boundary: boundary,
-                            extent: extent,
-                            searchDescription: searchDescription,
-                            statistics: statistics }))];
+                    hubEnrichments = __assign.apply(void 0, _b.concat([(_c.sent())]));
+                    _c.label = 4;
+                case 4: return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { layerId: layerId, 
+                        // Note that we are not extracting the slug for the specified layer.
+                        // It seems that the old client composer code always populated the slug
+                        // field with the slug that was passed into the function (typically the
+                        // slug of the parent service). To maintain parity, we do the same here.
+                        //
+                        // TODO: should we prefer the slug of the fetched layer instead?
+                        // return a new content object composed from the item and enrichments we fetched
+                        slug: fullyQualifiedSlug, 
+                        // merge error arrays
+                        errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
             }
         });
     }); };
@@ -11638,6 +11672,9 @@
                 break;
             case "months":
                 // get the current month and subtract num
+                // NOTE: when the previous month has fewer days than this month
+                // setMonth() will return a date w/in the current month
+                // example: 3/30 -> 3/2 b/c there is no 2/28
                 now.setMonth(now.getMonth() - relative.num);
                 result.from = now.getTime();
                 break;