@esri/hub-common 9.25.5 → 9.25.6
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 +20 -4
- package/dist/es2017/content/fetch.js.map +1 -1
- package/dist/esm/content/fetch.js +24 -10
- package/dist/esm/content/fetch.js.map +1 -1
- package/dist/node/content/fetch.js +19 -3
- package/dist/node/content/fetch.js.map +1 -1
- package/dist/umd/common.umd.js +44 -10
- 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 +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __rest } from "tslib";
|
|
2
|
-
import { queryFeatures } from "@esri/arcgis-rest-feature-layer";
|
|
2
|
+
import { getLayer, parseServiceUrl, queryFeatures, } from "@esri/arcgis-rest-feature-layer";
|
|
3
3
|
import { getItem } from "@esri/arcgis-rest-portal";
|
|
4
4
|
import { fetchItemEnrichments, } from "../items/_enrichments";
|
|
5
5
|
import { isNil } from "../util";
|
|
@@ -11,8 +11,22 @@ import { composeContent, getItemLayer, isLayerView } from "./compose";
|
|
|
11
11
|
const hasFeatures = (contentType) => ["Feature Layer", "Table"].includes(contentType);
|
|
12
12
|
const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
13
13
|
// determine if this is a client-side feature layer view
|
|
14
|
-
const { item, data
|
|
15
|
-
|
|
14
|
+
const { item, data } = itemAndEnrichments;
|
|
15
|
+
let { layers } = itemAndEnrichments;
|
|
16
|
+
let layer = layers && getItemLayer(item, layers, options && options.layerId);
|
|
17
|
+
// TODO: Remove once we stop supporting ArcGIS Servers below version 10.5.
|
|
18
|
+
// The /layers endpoint of some earlier servers return layers and tables
|
|
19
|
+
// without certain critical properties, such as type. If this is the case,
|
|
20
|
+
// fetch the fully hydrated target layer and stab it onto the layers array.
|
|
21
|
+
// See https://devtopia.esri.com/dc/hub/issues/3488 for more details
|
|
22
|
+
if (layer && !layer.type) {
|
|
23
|
+
const layerUrl = parseServiceUrl(item.url) + "/" + layer.id;
|
|
24
|
+
const getLayerOptions = Object.assign({ url: layerUrl }, options); // works whether options is defined or not
|
|
25
|
+
layer = await getLayer(getLayerOptions);
|
|
26
|
+
layers = layers.map((unhydratedLayer) => {
|
|
27
|
+
return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
|
|
28
|
+
});
|
|
29
|
+
}
|
|
16
30
|
// TODO: add recordCount here too?
|
|
17
31
|
const layerEnrichments = layer && isLayerView(layer) && !data
|
|
18
32
|
? // NOTE: I'm not sure what conditions causes a layer view
|
|
@@ -23,7 +37,9 @@ const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
|
23
37
|
: undefined;
|
|
24
38
|
return Object.assign(Object.assign(Object.assign({}, itemAndEnrichments), layerEnrichments), {
|
|
25
39
|
// merge error arrays
|
|
26
|
-
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors])
|
|
40
|
+
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]),
|
|
41
|
+
// Also remove once we stop supporting ArcGIS Servers below version 10.5
|
|
42
|
+
layers });
|
|
27
43
|
};
|
|
28
44
|
const fetchItemAndEnrichments = async (itemId, options) => {
|
|
29
45
|
// fetch the item
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __assign, __awaiter, __generator, __rest } from "tslib";
|
|
2
|
-
import { queryFeatures } from "@esri/arcgis-rest-feature-layer";
|
|
2
|
+
import { getLayer, parseServiceUrl, queryFeatures, } from "@esri/arcgis-rest-feature-layer";
|
|
3
3
|
import { getItem } from "@esri/arcgis-rest-portal";
|
|
4
4
|
import { fetchItemEnrichments, } from "../items/_enrichments";
|
|
5
5
|
import { isNil } from "../util";
|
|
@@ -12,31 +12,45 @@ var hasFeatures = function (contentType) {
|
|
|
12
12
|
return ["Feature Layer", "Table"].includes(contentType);
|
|
13
13
|
};
|
|
14
14
|
var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
15
|
-
var item, data, layers, layer, layerEnrichments, _a;
|
|
15
|
+
var item, data, layers, layer, layerUrl, getLayerOptions, layerEnrichments, _a;
|
|
16
16
|
return __generator(this, function (_b) {
|
|
17
17
|
switch (_b.label) {
|
|
18
18
|
case 0:
|
|
19
|
-
item = itemAndEnrichments.item, data = itemAndEnrichments.data
|
|
19
|
+
item = itemAndEnrichments.item, data = itemAndEnrichments.data;
|
|
20
|
+
layers = itemAndEnrichments.layers;
|
|
20
21
|
layer = layers && getItemLayer(item, layers, options && options.layerId);
|
|
21
|
-
if (!(layer &&
|
|
22
|
+
if (!(layer && !layer.type)) return [3 /*break*/, 2];
|
|
23
|
+
layerUrl = parseServiceUrl(item.url) + "/" + layer.id;
|
|
24
|
+
getLayerOptions = Object.assign({ url: layerUrl }, options);
|
|
25
|
+
return [4 /*yield*/, getLayer(getLayerOptions)];
|
|
26
|
+
case 1:
|
|
27
|
+
layer = _b.sent();
|
|
28
|
+
layers = layers.map(function (unhydratedLayer) {
|
|
29
|
+
return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
|
|
30
|
+
});
|
|
31
|
+
_b.label = 2;
|
|
32
|
+
case 2:
|
|
33
|
+
if (!(layer && isLayerView(layer) && !data)) return [3 /*break*/, 4];
|
|
22
34
|
// to store (at least part of) it's view definition in item data
|
|
23
35
|
// it seems that most do not, but until we have a reliable signal
|
|
24
36
|
// we just fetch the item data for all layer views
|
|
25
37
|
return [4 /*yield*/, fetchItemEnrichments(item, ["data"], options)];
|
|
26
|
-
case
|
|
38
|
+
case 3:
|
|
27
39
|
// to store (at least part of) it's view definition in item data
|
|
28
40
|
// it seems that most do not, but until we have a reliable signal
|
|
29
41
|
// we just fetch the item data for all layer views
|
|
30
42
|
_a = _b.sent();
|
|
31
|
-
return [3 /*break*/,
|
|
32
|
-
case
|
|
43
|
+
return [3 /*break*/, 5];
|
|
44
|
+
case 4:
|
|
33
45
|
_a = undefined;
|
|
34
|
-
_b.label =
|
|
35
|
-
case
|
|
46
|
+
_b.label = 5;
|
|
47
|
+
case 5:
|
|
36
48
|
layerEnrichments = _a;
|
|
37
49
|
return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), {
|
|
38
50
|
// merge error arrays
|
|
39
|
-
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors])
|
|
51
|
+
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]),
|
|
52
|
+
// Also remove once we stop supporting ArcGIS Servers below version 10.5
|
|
53
|
+
layers: layers })];
|
|
40
54
|
}
|
|
41
55
|
});
|
|
42
56
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,22 @@ const compose_1 = require("./compose");
|
|
|
14
14
|
const hasFeatures = (contentType) => ["Feature Layer", "Table"].includes(contentType);
|
|
15
15
|
const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
16
16
|
// determine if this is a client-side feature layer view
|
|
17
|
-
const { item, data
|
|
18
|
-
|
|
17
|
+
const { item, data } = itemAndEnrichments;
|
|
18
|
+
let { layers } = itemAndEnrichments;
|
|
19
|
+
let layer = layers && compose_1.getItemLayer(item, layers, options && options.layerId);
|
|
20
|
+
// TODO: Remove once we stop supporting ArcGIS Servers below version 10.5.
|
|
21
|
+
// The /layers endpoint of some earlier servers return layers and tables
|
|
22
|
+
// without certain critical properties, such as type. If this is the case,
|
|
23
|
+
// fetch the fully hydrated target layer and stab it onto the layers array.
|
|
24
|
+
// See https://devtopia.esri.com/dc/hub/issues/3488 for more details
|
|
25
|
+
if (layer && !layer.type) {
|
|
26
|
+
const layerUrl = arcgis_rest_feature_layer_1.parseServiceUrl(item.url) + "/" + layer.id;
|
|
27
|
+
const getLayerOptions = Object.assign({ url: layerUrl }, options); // works whether options is defined or not
|
|
28
|
+
layer = await arcgis_rest_feature_layer_1.getLayer(getLayerOptions);
|
|
29
|
+
layers = layers.map((unhydratedLayer) => {
|
|
30
|
+
return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
|
|
31
|
+
});
|
|
32
|
+
}
|
|
19
33
|
// TODO: add recordCount here too?
|
|
20
34
|
const layerEnrichments = layer && compose_1.isLayerView(layer) && !data
|
|
21
35
|
? // NOTE: I'm not sure what conditions causes a layer view
|
|
@@ -26,7 +40,9 @@ const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
|
26
40
|
: undefined;
|
|
27
41
|
return Object.assign(Object.assign(Object.assign({}, itemAndEnrichments), layerEnrichments), {
|
|
28
42
|
// merge error arrays
|
|
29
|
-
errors: _array_1.maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors])
|
|
43
|
+
errors: _array_1.maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]),
|
|
44
|
+
// Also remove once we stop supporting ArcGIS Servers below version 10.5
|
|
45
|
+
layers });
|
|
30
46
|
};
|
|
31
47
|
const fetchItemAndEnrichments = async (itemId, options) => {
|
|
32
48
|
// fetch the item
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
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.25.
|
|
2
|
+
* @esri/hub-common - v9.25.5 - Fri Apr 01 2022 14:27:54 GMT+0000 (Coordinated Universal Time)
|
|
3
3
|
* Copyright (c) 2022 Environmental Systems Research Institute, Inc.
|
|
4
4
|
* Apache-2.0
|
|
5
5
|
*/
|
|
@@ -6172,6 +6172,26 @@
|
|
|
6172
6172
|
return request(layersUrl, requestOptions);
|
|
6173
6173
|
}
|
|
6174
6174
|
|
|
6175
|
+
/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
|
|
6176
|
+
* Apache-2.0 */
|
|
6177
|
+
/**
|
|
6178
|
+
* ```js
|
|
6179
|
+
* import { getLayer } from '@esri/arcgis-rest-feature-layer';
|
|
6180
|
+
* //
|
|
6181
|
+
* getLayer({
|
|
6182
|
+
* url: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/ServiceRequest/FeatureServer/0"
|
|
6183
|
+
* })
|
|
6184
|
+
* .then(response) // { name: "311", id: 0, ... }
|
|
6185
|
+
* ```
|
|
6186
|
+
* Layer (Feature Service) request. See the [REST Documentation](https://developers.arcgis.com/rest/services-reference/layer-feature-service-.htm) for more information.
|
|
6187
|
+
*
|
|
6188
|
+
* @param options - Options for the request.
|
|
6189
|
+
* @returns A Promise that will resolve with the addFeatures response.
|
|
6190
|
+
*/
|
|
6191
|
+
function getLayer(options) {
|
|
6192
|
+
return request(cleanUrl(options.url), options);
|
|
6193
|
+
}
|
|
6194
|
+
|
|
6175
6195
|
/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
|
|
6176
6196
|
* Apache-2.0 */
|
|
6177
6197
|
/**
|
|
@@ -9026,31 +9046,45 @@
|
|
|
9026
9046
|
return ["Feature Layer", "Table"].includes(contentType);
|
|
9027
9047
|
};
|
|
9028
9048
|
var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9029
|
-
var item, data, layers, layer, layerEnrichments, _a;
|
|
9049
|
+
var item, data, layers, layer, layerUrl, getLayerOptions, layerEnrichments, _a;
|
|
9030
9050
|
return __generator(this, function (_b) {
|
|
9031
9051
|
switch (_b.label) {
|
|
9032
9052
|
case 0:
|
|
9033
|
-
item = itemAndEnrichments.item, data = itemAndEnrichments.data
|
|
9053
|
+
item = itemAndEnrichments.item, data = itemAndEnrichments.data;
|
|
9054
|
+
layers = itemAndEnrichments.layers;
|
|
9034
9055
|
layer = layers && getItemLayer(item, layers, options && options.layerId);
|
|
9035
|
-
if (!(layer &&
|
|
9056
|
+
if (!(layer && !layer.type)) return [3 /*break*/, 2];
|
|
9057
|
+
layerUrl = parseServiceUrl(item.url) + "/" + layer.id;
|
|
9058
|
+
getLayerOptions = Object.assign({ url: layerUrl }, options);
|
|
9059
|
+
return [4 /*yield*/, getLayer(getLayerOptions)];
|
|
9060
|
+
case 1:
|
|
9061
|
+
layer = _b.sent();
|
|
9062
|
+
layers = layers.map(function (unhydratedLayer) {
|
|
9063
|
+
return unhydratedLayer.id === layer.id ? layer : unhydratedLayer;
|
|
9064
|
+
});
|
|
9065
|
+
_b.label = 2;
|
|
9066
|
+
case 2:
|
|
9067
|
+
if (!(layer && isLayerView(layer) && !data)) return [3 /*break*/, 4];
|
|
9036
9068
|
// to store (at least part of) it's view definition in item data
|
|
9037
9069
|
// it seems that most do not, but until we have a reliable signal
|
|
9038
9070
|
// we just fetch the item data for all layer views
|
|
9039
9071
|
return [4 /*yield*/, fetchItemEnrichments(item, ["data"], options)];
|
|
9040
|
-
case
|
|
9072
|
+
case 3:
|
|
9041
9073
|
// to store (at least part of) it's view definition in item data
|
|
9042
9074
|
// it seems that most do not, but until we have a reliable signal
|
|
9043
9075
|
// we just fetch the item data for all layer views
|
|
9044
9076
|
_a = _b.sent();
|
|
9045
|
-
return [3 /*break*/,
|
|
9046
|
-
case
|
|
9077
|
+
return [3 /*break*/, 5];
|
|
9078
|
+
case 4:
|
|
9047
9079
|
_a = undefined;
|
|
9048
|
-
_b.label =
|
|
9049
|
-
case
|
|
9080
|
+
_b.label = 5;
|
|
9081
|
+
case 5:
|
|
9050
9082
|
layerEnrichments = _a;
|
|
9051
9083
|
return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), {
|
|
9052
9084
|
// merge error arrays
|
|
9053
|
-
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors])
|
|
9085
|
+
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]),
|
|
9086
|
+
// Also remove once we stop supporting ArcGIS Servers below version 10.5
|
|
9087
|
+
layers: layers })];
|
|
9054
9088
|
}
|
|
9055
9089
|
});
|
|
9056
9090
|
}); };
|