@esri/hub-common 9.23.0 → 9.23.3

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.22.0 - Wed Mar 16 2022 23:32:36 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.23.2 - Mon Mar 21 2022 18:15:17 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -7017,8 +7017,8 @@
 
     // helper fns - move this to _internal if needed elsewhere
     var getOnlyQueryLayer = function (layers) {
-        var layer = layers && layers.length === 1 && layers[0];
-        return layer && layer.capabilities.includes("Query") && layer;
+        var layer = layers && layers.length === 1 ? layers[0] : undefined;
+        return layer && layer.capabilities.includes("Query") ? layer : undefined;
     };
     var shouldUseLayerInfo = function (layer, layers, url) {
         return (layer &&
@@ -7027,6 +7027,13 @@
             // we use item info instead of layer info for single layer items
             !getLayerIdFromUrl(url));
     };
+    // this logic adapted from hub-indexer's determineName(), see
+    // https://github.com/ArcGIS/hub-indexer/blob/8f4dd6f928124c1f35dd02bc11bd996191ee1160/packages/duke/compose/common.js#L7-L34
+    var getContentName = function (item, layer, layers) {
+        return ((shouldUseLayerInfo(layer, layers, item.url)
+            ? layer.name
+            : item.title || item.name) || "").replace(/_/g, " ");
+    };
     /**
      * The possible values for updateFrequency
      *
@@ -7430,9 +7437,8 @@
             : undefined;
         var identifier = slug || hubId || item.id;
         // whether or not we should show layer info for name, description, etc
-        var _shouldUseLayerInfo = shouldUseLayerInfo(layer, layers, item.url);
-        var name = _shouldUseLayerInfo ? layer.name : item.title;
-        var _layerDescription = _shouldUseLayerInfo && layer.description;
+        var name = getContentName(item, layer, layers);
+        var _layerDescription = shouldUseLayerInfo(layer, layers, item.url) && layer.description;
         // so much depends on type
         var type = layer
             ? // use layer type (Feature Layer, Table, etc) for layer content
@@ -7487,7 +7493,7 @@
             }, get url() {
                 return _proxyUrl
                     ? _proxyUrl
-                    : _shouldUseLayerInfo
+                    : layer
                         ? parseServiceUrl(item.url) + "/" + layer.id
                         : item.url;
             }, get categories() {
@@ -8957,6 +8963,9 @@
         });
     }); };
 
+    var hasFeatures = function (contentType) {
+        return ["Feature Layer", "Table"].includes(contentType);
+    };
     var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
         var item, data, layers, layer, layerEnrichments, _a;
         return __generator(this, function (_b) {
@@ -9029,7 +9038,7 @@
         });
     }); };
     var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, slug, boundary, extent, searchDescription, statistics;
+        var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, boundary, extent, searchDescription, statistics;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
@@ -9040,8 +9049,8 @@
                     return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
                 case 2:
                     _a = _b.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
-                    specifiedLayerId = options && !isNil(options.layerId) && options.layerId;
-                    if (!(specifiedLayerId && specifiedLayerId !== layerId)) return [3 /*break*/, 4];
+                    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
@@ -9051,11 +9060,9 @@
                     hubEnrichments = _b.sent();
                     _b.label = 4;
                 case 4:
-                    slug = hubEnrichments.slug, boundary = hubEnrichments.boundary, extent = hubEnrichments.extent, searchDescription = hubEnrichments.searchDescription, statistics = hubEnrichments.statistics;
+                    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: slug,
-                            boundary: boundary,
+                    return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId, slug: fullyQualifiedSlug, boundary: boundary,
                             extent: extent,
                             searchDescription: searchDescription,
                             statistics: statistics }))];
@@ -9093,7 +9100,7 @@
      * ```
      */
     var fetchContent = function (identifier, options) { return __awaiter(void 0, void 0, void 0, function () {
-        var content, _a, isProxied, layer, _b, _c;
+        var content, _a, layer, type, _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -9108,9 +9115,9 @@
                     _d.label = 4;
                 case 4:
                     content = _a;
-                    isProxied = content.isProxied, layer = content.layer;
+                    layer = content.layer, type = content.type;
                     _b = content;
-                    if (!(isProxied || !!layer)) return [3 /*break*/, 6];
+                    if (!(!!layer && hasFeatures(type))) return [3 /*break*/, 6];
                     return [4 /*yield*/, fetchContentRecordCount(content)];
                 case 5:
                     _c = _d.sent();