@esri/hub-common 9.23.2 → 9.23.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es2017/content/fetch.js +14 -7
- package/dist/es2017/content/fetch.js.map +1 -1
- package/dist/esm/content/fetch.js +9 -8
- package/dist/esm/content/fetch.js.map +1 -1
- package/dist/node/content/fetch.js +14 -7
- package/dist/node/content/fetch.js.map +1 -1
- package/dist/umd/common.umd.js +10 -9
- package/dist/umd/common.umd.js.map +1 -1
- package/dist/umd/common.umd.min.js +1 -1
- package/dist/umd/common.umd.min.js.map +1 -1
- package/package.json +5 -3
|
@@ -7,6 +7,7 @@ import { addContextToSlug, isSlug, parseDatasetId } from "./slugs";
|
|
|
7
7
|
import { fetchHubEnrichmentsById, fetchHubEnrichmentsBySlug, getContentEnrichments, } from "./_fetch";
|
|
8
8
|
import { canUseHubApiForItem } from "./_internal";
|
|
9
9
|
import { composeContent, getItemLayer, isLayerView } from "./compose";
|
|
10
|
+
const hasFeatures = (contentType) => ["Feature Layer", "Table"].includes(contentType);
|
|
10
11
|
const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
11
12
|
// determine if this is a client-side feature layer view
|
|
12
13
|
const { item, data, layers } = itemAndEnrichments;
|
|
@@ -65,11 +66,15 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
|
65
66
|
layerId = specifiedLayerId;
|
|
66
67
|
hubEnrichments = await fetchHubEnrichmentsById(`${itemId}_${layerId}`, options);
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
+
// Note that we are not extracting the slug for the specified layer.
|
|
70
|
+
// It seems that the old client composer code always populated the slug
|
|
71
|
+
// field with the slug that was passed into the function (typically the
|
|
72
|
+
// slug of the parent service). To maintain parity, we do the same here.
|
|
73
|
+
//
|
|
74
|
+
// TODO: should we prefer the slug of the fetched layer instead?
|
|
75
|
+
const { boundary, extent, searchDescription, statistics } = hubEnrichments;
|
|
69
76
|
// return a new content object composed from the item and enrichments we fetched
|
|
70
|
-
return composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { layerId,
|
|
71
|
-
slug,
|
|
72
|
-
boundary,
|
|
77
|
+
return composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { layerId, slug: fullyQualifiedSlug, boundary,
|
|
73
78
|
extent,
|
|
74
79
|
searchDescription,
|
|
75
80
|
statistics }));
|
|
@@ -100,10 +105,12 @@ export const fetchContent = async (identifier, options) => {
|
|
|
100
105
|
const content = isSlug(identifier)
|
|
101
106
|
? await fetchContentBySlug(addContextToSlug(identifier, options === null || options === void 0 ? void 0 : options.siteOrgKey), options)
|
|
102
107
|
: await fetchContentById(identifier, options);
|
|
103
|
-
// fetch record count for layers, tables, or proxied CSVs
|
|
104
|
-
const {
|
|
108
|
+
// fetch record count for content that has features (e.g. layers, tables, or proxied CSVs)
|
|
109
|
+
const { layer, type } = content;
|
|
105
110
|
content.recordCount =
|
|
106
|
-
|
|
111
|
+
!!layer && hasFeatures(type)
|
|
112
|
+
? await fetchContentRecordCount(content)
|
|
113
|
+
: undefined;
|
|
107
114
|
return content;
|
|
108
115
|
};
|
|
109
116
|
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAEL,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAEL,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ import { addContextToSlug, isSlug, parseDatasetId } from "./slugs";
|
|
|
7
7
|
import { fetchHubEnrichmentsById, fetchHubEnrichmentsBySlug, getContentEnrichments, } from "./_fetch";
|
|
8
8
|
import { canUseHubApiForItem } from "./_internal";
|
|
9
9
|
import { composeContent, getItemLayer, isLayerView } from "./compose";
|
|
10
|
+
var hasFeatures = function (contentType) {
|
|
11
|
+
return ["Feature Layer", "Table"].includes(contentType);
|
|
12
|
+
};
|
|
10
13
|
var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
11
14
|
var item, data, layers, layer, layerEnrichments, _a;
|
|
12
15
|
return __generator(this, function (_b) {
|
|
@@ -79,7 +82,7 @@ var fetchContentById = function (hubId, options) { return __awaiter(void 0, void
|
|
|
79
82
|
});
|
|
80
83
|
}); };
|
|
81
84
|
var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
82
|
-
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId,
|
|
85
|
+
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, boundary, extent, searchDescription, statistics;
|
|
83
86
|
return __generator(this, function (_b) {
|
|
84
87
|
switch (_b.label) {
|
|
85
88
|
case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
|
|
@@ -101,11 +104,9 @@ var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __await
|
|
|
101
104
|
hubEnrichments = _b.sent();
|
|
102
105
|
_b.label = 4;
|
|
103
106
|
case 4:
|
|
104
|
-
|
|
107
|
+
boundary = hubEnrichments.boundary, extent = hubEnrichments.extent, searchDescription = hubEnrichments.searchDescription, statistics = hubEnrichments.statistics;
|
|
105
108
|
// return a new content object composed from the item and enrichments we fetched
|
|
106
|
-
return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId,
|
|
107
|
-
slug: slug,
|
|
108
|
-
boundary: boundary,
|
|
109
|
+
return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId, slug: fullyQualifiedSlug, boundary: boundary,
|
|
109
110
|
extent: extent,
|
|
110
111
|
searchDescription: searchDescription,
|
|
111
112
|
statistics: statistics }))];
|
|
@@ -143,7 +144,7 @@ var fetchContentRecordCount = function (content) { return __awaiter(void 0, void
|
|
|
143
144
|
* ```
|
|
144
145
|
*/
|
|
145
146
|
export var fetchContent = function (identifier, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
146
|
-
var content, _a,
|
|
147
|
+
var content, _a, layer, type, _b, _c;
|
|
147
148
|
return __generator(this, function (_d) {
|
|
148
149
|
switch (_d.label) {
|
|
149
150
|
case 0:
|
|
@@ -158,9 +159,9 @@ export var fetchContent = function (identifier, options) { return __awaiter(void
|
|
|
158
159
|
_d.label = 4;
|
|
159
160
|
case 4:
|
|
160
161
|
content = _a;
|
|
161
|
-
|
|
162
|
+
layer = content.layer, type = content.type;
|
|
162
163
|
_b = content;
|
|
163
|
-
if (!(
|
|
164
|
+
if (!(!!layer && hasFeatures(type))) return [3 /*break*/, 6];
|
|
164
165
|
return [4 /*yield*/, fetchContentRecordCount(content)];
|
|
165
166
|
case 5:
|
|
166
167
|
_c = _d.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAEL,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAEL,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const slugs_1 = require("./slugs");
|
|
|
10
10
|
const _fetch_1 = require("./_fetch");
|
|
11
11
|
const _internal_1 = require("./_internal");
|
|
12
12
|
const compose_1 = require("./compose");
|
|
13
|
+
const hasFeatures = (contentType) => ["Feature Layer", "Table"].includes(contentType);
|
|
13
14
|
const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
14
15
|
// determine if this is a client-side feature layer view
|
|
15
16
|
const { item, data, layers } = itemAndEnrichments;
|
|
@@ -68,11 +69,15 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
|
68
69
|
layerId = specifiedLayerId;
|
|
69
70
|
hubEnrichments = await _fetch_1.fetchHubEnrichmentsById(`${itemId}_${layerId}`, options);
|
|
70
71
|
}
|
|
71
|
-
|
|
72
|
+
// Note that we are not extracting the slug for the specified layer.
|
|
73
|
+
// It seems that the old client composer code always populated the slug
|
|
74
|
+
// field with the slug that was passed into the function (typically the
|
|
75
|
+
// slug of the parent service). To maintain parity, we do the same here.
|
|
76
|
+
//
|
|
77
|
+
// TODO: should we prefer the slug of the fetched layer instead?
|
|
78
|
+
const { boundary, extent, searchDescription, statistics } = hubEnrichments;
|
|
72
79
|
// return a new content object composed from the item and enrichments we fetched
|
|
73
|
-
return compose_1.composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { layerId,
|
|
74
|
-
slug,
|
|
75
|
-
boundary,
|
|
80
|
+
return compose_1.composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), { layerId, slug: fullyQualifiedSlug, boundary,
|
|
76
81
|
extent,
|
|
77
82
|
searchDescription,
|
|
78
83
|
statistics }));
|
|
@@ -103,10 +108,12 @@ exports.fetchContent = async (identifier, options) => {
|
|
|
103
108
|
const content = slugs_1.isSlug(identifier)
|
|
104
109
|
? await fetchContentBySlug(slugs_1.addContextToSlug(identifier, options === null || options === void 0 ? void 0 : options.siteOrgKey), options)
|
|
105
110
|
: await fetchContentById(identifier, options);
|
|
106
|
-
// fetch record count for layers, tables, or proxied CSVs
|
|
107
|
-
const {
|
|
111
|
+
// fetch record count for content that has features (e.g. layers, tables, or proxied CSVs)
|
|
112
|
+
const { layer, type } = content;
|
|
108
113
|
content.recordCount =
|
|
109
|
-
|
|
114
|
+
!!layer && hasFeatures(type)
|
|
115
|
+
? await fetchContentRecordCount(content)
|
|
116
|
+
: undefined;
|
|
110
117
|
return content;
|
|
111
118
|
};
|
|
112
119
|
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";;;;AAAA,+EAAgE;AAChE,iEAAmD;AAEnD,wDAI+B;AAE/B,kCAAgC;AAChC,mCAAmE;AACnE,qCAKkB;AAClB,2CAAkD;AAClD,uCAAsE;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/umd/common.umd.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* @esri/hub-common - v9.23.
|
|
2
|
+
* @esri/hub-common - v9.23.2 - Mon Mar 21 2022 18:15:17 GMT+0000 (Coordinated Universal Time)
|
|
3
3
|
* Copyright (c) 2022 Environmental Systems Research Institute, Inc.
|
|
4
4
|
* Apache-2.0
|
|
5
5
|
*/
|
|
@@ -8963,6 +8963,9 @@
|
|
|
8963
8963
|
});
|
|
8964
8964
|
}); };
|
|
8965
8965
|
|
|
8966
|
+
var hasFeatures = function (contentType) {
|
|
8967
|
+
return ["Feature Layer", "Table"].includes(contentType);
|
|
8968
|
+
};
|
|
8966
8969
|
var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
8967
8970
|
var item, data, layers, layer, layerEnrichments, _a;
|
|
8968
8971
|
return __generator(this, function (_b) {
|
|
@@ -9035,7 +9038,7 @@
|
|
|
9035
9038
|
});
|
|
9036
9039
|
}); };
|
|
9037
9040
|
var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9038
|
-
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId,
|
|
9041
|
+
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, boundary, extent, searchDescription, statistics;
|
|
9039
9042
|
return __generator(this, function (_b) {
|
|
9040
9043
|
switch (_b.label) {
|
|
9041
9044
|
case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
|
|
@@ -9057,11 +9060,9 @@
|
|
|
9057
9060
|
hubEnrichments = _b.sent();
|
|
9058
9061
|
_b.label = 4;
|
|
9059
9062
|
case 4:
|
|
9060
|
-
|
|
9063
|
+
boundary = hubEnrichments.boundary, extent = hubEnrichments.extent, searchDescription = hubEnrichments.searchDescription, statistics = hubEnrichments.statistics;
|
|
9061
9064
|
// return a new content object composed from the item and enrichments we fetched
|
|
9062
|
-
return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId,
|
|
9063
|
-
slug: slug,
|
|
9064
|
-
boundary: boundary,
|
|
9065
|
+
return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments), { layerId: layerId, slug: fullyQualifiedSlug, boundary: boundary,
|
|
9065
9066
|
extent: extent,
|
|
9066
9067
|
searchDescription: searchDescription,
|
|
9067
9068
|
statistics: statistics }))];
|
|
@@ -9099,7 +9100,7 @@
|
|
|
9099
9100
|
* ```
|
|
9100
9101
|
*/
|
|
9101
9102
|
var fetchContent = function (identifier, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9102
|
-
var content, _a,
|
|
9103
|
+
var content, _a, layer, type, _b, _c;
|
|
9103
9104
|
return __generator(this, function (_d) {
|
|
9104
9105
|
switch (_d.label) {
|
|
9105
9106
|
case 0:
|
|
@@ -9114,9 +9115,9 @@
|
|
|
9114
9115
|
_d.label = 4;
|
|
9115
9116
|
case 4:
|
|
9116
9117
|
content = _a;
|
|
9117
|
-
|
|
9118
|
+
layer = content.layer, type = content.type;
|
|
9118
9119
|
_b = content;
|
|
9119
|
-
if (!(
|
|
9120
|
+
if (!(!!layer && hasFeatures(type))) return [3 /*break*/, 6];
|
|
9120
9121
|
return [4 /*yield*/, fetchContentRecordCount(content)];
|
|
9121
9122
|
case 5:
|
|
9122
9123
|
_c = _d.sent();
|