@esri/hub-common 9.25.0 → 9.25.1
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 +16 -3
- package/dist/es2017/content/_fetch.js.map +1 -1
- package/dist/es2017/content/fetch.js +27 -23
- package/dist/es2017/content/fetch.js.map +1 -1
- package/dist/es2017/items/_enrichments.js +29 -14
- package/dist/es2017/items/_enrichments.js.map +1 -1
- package/dist/es2017/utils/_array.js +13 -0
- package/dist/es2017/utils/_array.js.map +1 -0
- package/dist/esm/content/_fetch.js +14 -3
- package/dist/esm/content/_fetch.js.map +1 -1
- package/dist/esm/content/fetch.js +40 -31
- package/dist/esm/content/fetch.js.map +1 -1
- package/dist/esm/items/_enrichments.js +29 -14
- package/dist/esm/items/_enrichments.js.map +1 -1
- package/dist/esm/utils/_array.js +13 -0
- package/dist/esm/utils/_array.js.map +1 -0
- package/dist/node/content/_fetch.js +16 -3
- package/dist/node/content/_fetch.js.map +1 -1
- package/dist/node/content/fetch.js +27 -23
- package/dist/node/content/fetch.js.map +1 -1
- package/dist/node/items/_enrichments.js +30 -15
- package/dist/node/items/_enrichments.js.map +1 -1
- package/dist/node/utils/_array.js +16 -0
- package/dist/node/utils/_array.js.map +1 -0
- package/dist/types/content/_fetch.d.ts +9 -4
- package/dist/types/items/_enrichments.d.ts +10 -1
- package/dist/types/utils/_array.d.ts +9 -0
- package/dist/umd/common.umd.js +95 -49
- 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,3 +1,4 @@
|
|
|
1
|
+
import { getEnrichmentErrors, } from "../items/_enrichments";
|
|
1
2
|
import { hubApiRequest } from "../request";
|
|
2
3
|
import { isMapOrFeatureServerUrl } from "../urls";
|
|
3
4
|
import { cloneObject } from "../util";
|
|
@@ -41,7 +42,9 @@ export const getContentEnrichments = (item) => {
|
|
|
41
42
|
// that we fetch from the Hub API, and to optionally filter by slug
|
|
42
43
|
const getHubEnrichmentsOptions = (requestOptions, slug) => {
|
|
43
44
|
const opts = cloneObject(requestOptions);
|
|
44
|
-
opts.params = Object.assign(Object.assign({}, opts.params), {
|
|
45
|
+
opts.params = Object.assign(Object.assign({}, opts.params), {
|
|
46
|
+
// TODO: we should fetch errors too
|
|
47
|
+
"fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
|
|
45
48
|
if (slug) {
|
|
46
49
|
opts.params["filter[slug]"] = slug;
|
|
47
50
|
}
|
|
@@ -70,6 +73,9 @@ const getDatasetEnrichments = (dataset) => {
|
|
|
70
73
|
* @private
|
|
71
74
|
*/
|
|
72
75
|
export const fetchHubEnrichmentsBySlug = async (slug, requestOptions) => {
|
|
76
|
+
// NOTE: we don't catch errors here b/c
|
|
77
|
+
// searching by slug is the first step in fetchContent()
|
|
78
|
+
// and if this fails, we don't have an id to fall back on
|
|
73
79
|
const response = await hubApiRequest(`/datasets`, getHubEnrichmentsOptions(requestOptions, slug));
|
|
74
80
|
return getDatasetEnrichments(response.data[0]);
|
|
75
81
|
};
|
|
@@ -81,7 +87,14 @@ export const fetchHubEnrichmentsBySlug = async (slug, requestOptions) => {
|
|
|
81
87
|
* @private
|
|
82
88
|
*/
|
|
83
89
|
export const fetchHubEnrichmentsById = async (hubId, requestOptions) => {
|
|
84
|
-
|
|
85
|
-
|
|
90
|
+
try {
|
|
91
|
+
const response = await hubApiRequest(`/datasets/${hubId}`, getHubEnrichmentsOptions(requestOptions));
|
|
92
|
+
return getDatasetEnrichments(response.data);
|
|
93
|
+
}
|
|
94
|
+
catch (e) {
|
|
95
|
+
// dataset record not found, just log the error
|
|
96
|
+
// b/c we can still look up the item and enrichments by id
|
|
97
|
+
return { errors: getEnrichmentErrors(e) };
|
|
98
|
+
}
|
|
86
99
|
};
|
|
87
100
|
//# sourceMappingURL=_fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_fetch.js","sourceRoot":"","sources":["../../../src/content/_fetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"_fetch.js","sourceRoot":"","sources":["../../../src/content/_fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { 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";
|
|
6
|
+
import { maybeConcat } from "../utils/_array";
|
|
6
7
|
import { addContextToSlug, isSlug, parseDatasetId } from "./slugs";
|
|
7
8
|
import { fetchHubEnrichmentsById, fetchHubEnrichmentsBySlug, getContentEnrichments, } from "./_fetch";
|
|
8
9
|
import { canUseHubApiForItem } from "./_internal";
|
|
@@ -20,8 +21,9 @@ const maybeFetchLayerEnrichments = async (itemAndEnrichments, options) => {
|
|
|
20
21
|
// we just fetch the item data for all layer views
|
|
21
22
|
await fetchItemEnrichments(item, ["data"], options)
|
|
22
23
|
: undefined;
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
return Object.assign(Object.assign(Object.assign({}, itemAndEnrichments), layerEnrichments), {
|
|
25
|
+
// merge error arrays
|
|
26
|
+
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) });
|
|
25
27
|
};
|
|
26
28
|
const fetchItemAndEnrichments = async (itemId, options) => {
|
|
27
29
|
// fetch the item
|
|
@@ -39,14 +41,17 @@ const fetchContentById = async (hubId, options) => {
|
|
|
39
41
|
const specifiedLayerId = options && options.layerId;
|
|
40
42
|
// if this is a public item and we're not in enterprise
|
|
41
43
|
// fetch the slug and remaining enrichments from the Hub API
|
|
42
|
-
const { slug, layerId, boundary, extent, searchDescription, statistics } =
|
|
44
|
+
// const { slug, layerId, boundary, extent, searchDescription, statistics } =
|
|
45
|
+
const hubEnrichments = canUseHubApiForItem(item, options)
|
|
43
46
|
? await fetchHubEnrichmentsById(hubId, options)
|
|
44
47
|
: {};
|
|
48
|
+
const layerId = hubEnrichments.layerId;
|
|
45
49
|
// return a new content object composed from the item and enrichments we fetched
|
|
46
|
-
return composeContent(item, Object.assign(Object.assign({ requestOptions: options }, itemEnrichments),
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
+
return composeContent(item, Object.assign(Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), hubEnrichments), {
|
|
51
|
+
// prefer specified layer id if any
|
|
52
|
+
layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId,
|
|
53
|
+
// merge error arrays
|
|
54
|
+
errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }));
|
|
50
55
|
};
|
|
51
56
|
const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
52
57
|
// we only have a slug, not an item id, so we start by
|
|
@@ -60,24 +65,23 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
|
60
65
|
// did the caller request a specific layer
|
|
61
66
|
const specifiedLayerId = options && options.layerId;
|
|
62
67
|
if (!isNil(specifiedLayerId) && specifiedLayerId !== layerId) {
|
|
63
|
-
// we fetched Hub enrichments by slug for another
|
|
64
|
-
// most likely for the parent service of this layer,
|
|
65
|
-
// we need to fetch them for the specified layer instead
|
|
68
|
+
// we fetched Hub enrichments by slug for another record,
|
|
69
|
+
// most likely the record for the parent service of this layer,
|
|
70
|
+
// so we need to fetch them for the specified layer instead
|
|
66
71
|
layerId = specifiedLayerId;
|
|
67
|
-
hubEnrichments = await fetchHubEnrichmentsById(`${itemId}_${layerId}`, options);
|
|
72
|
+
hubEnrichments = Object.assign(Object.assign({}, hubEnrichments), (await fetchHubEnrichmentsById(`${itemId}_${layerId}`, options)));
|
|
68
73
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
statistics }));
|
|
74
|
+
return composeContent(item, Object.assign(Object.assign(Object.assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { layerId,
|
|
75
|
+
// Note that we are not extracting the slug for the specified layer.
|
|
76
|
+
// It seems that the old client composer code always populated the slug
|
|
77
|
+
// field with the slug that was passed into the function (typically the
|
|
78
|
+
// slug of the parent service). To maintain parity, we do the same here.
|
|
79
|
+
//
|
|
80
|
+
// TODO: should we prefer the slug of the fetched layer instead?
|
|
81
|
+
// return a new content object composed from the item and enrichments we fetched
|
|
82
|
+
slug: fullyQualifiedSlug,
|
|
83
|
+
// merge error arrays
|
|
84
|
+
errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }));
|
|
81
85
|
};
|
|
82
86
|
const fetchContentRecordCount = async (content, requestOptions) => {
|
|
83
87
|
const { url, viewDefinition } = content;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,29 +126,44 @@ const enrichLayers = (input) => {
|
|
|
126
126
|
const handleEnrichmentError = (error, input, opId) => {
|
|
127
127
|
const { data, stack, requestOptions } = input;
|
|
128
128
|
stack.finish(opId, { error });
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
errors.push({
|
|
135
|
-
// NOTE: for now we just return the message and type "Other"
|
|
136
|
-
// but we could later introspect for HTTP or AGO errors
|
|
137
|
-
// and/or return the status code if available
|
|
138
|
-
type: "Other",
|
|
139
|
-
message,
|
|
140
|
-
});
|
|
141
|
-
return { data: Object.assign(Object.assign({}, data), { errors }), stack, requestOptions };
|
|
129
|
+
return {
|
|
130
|
+
data: Object.assign(Object.assign({}, data), { errors: getEnrichmentErrors(error, data.errors) }),
|
|
131
|
+
stack,
|
|
132
|
+
requestOptions,
|
|
133
|
+
};
|
|
142
134
|
};
|
|
143
135
|
const enrichmentOperations = {
|
|
144
136
|
groupIds: enrichGroupIds,
|
|
145
137
|
metadata: enrichMetadata,
|
|
146
138
|
ownerUser: enrichOwnerUser,
|
|
147
|
-
// TOOD: org
|
|
148
139
|
data: enrichData,
|
|
149
140
|
server: enrichServer,
|
|
150
141
|
layers: enrichLayers,
|
|
151
142
|
};
|
|
143
|
+
/**
|
|
144
|
+
* convert an error to an enrichment error info format
|
|
145
|
+
* and optionally append it to an existing array of those
|
|
146
|
+
* @param error
|
|
147
|
+
* @param errors an array of existing enrichment error info
|
|
148
|
+
* @returns a new array of enrichment error info
|
|
149
|
+
* @private
|
|
150
|
+
*/
|
|
151
|
+
export const getEnrichmentErrors = (error, errors = []) => {
|
|
152
|
+
const message = typeof error === "string"
|
|
153
|
+
? /* istanbul ignore next our tests only throw Error objects */
|
|
154
|
+
error
|
|
155
|
+
: error.message;
|
|
156
|
+
return [
|
|
157
|
+
...errors,
|
|
158
|
+
{
|
|
159
|
+
// NOTE: for now we just return the message and type "Other"
|
|
160
|
+
// but we could later introspect for HTTP or AGO errors
|
|
161
|
+
// and/or return the status code if available
|
|
162
|
+
type: "Other",
|
|
163
|
+
message,
|
|
164
|
+
},
|
|
165
|
+
];
|
|
166
|
+
};
|
|
152
167
|
/**
|
|
153
168
|
* Fetch enrichments for an item
|
|
154
169
|
* @param item
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_enrichments.js","sourceRoot":"","sources":["../../../src/items/_enrichments.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,aAAa,EACb,OAAO,GACR,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,qBAAqB,EACrB,UAAU,GACX,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAa,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,+CAA+C;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,MAAM,IAAI,GAAG;QACX,8CAA8C;QAC9C,gBAAgB,EAAE,KAAK;QACvB,mBAAmB,EAAE,IAAI;QACzB,YAAY,EAAE,QAAQ;KACvB,CAAC;IACF,OAAO,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAC3B,EAAU,EACV,cAAmC;IAEnC,OAAO,eAAe,CAAC,EAAE,EAAE,cAAc,CAAC;SACvC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;SACpD,KAAK,CAAC,GAAG,EAAE;QACV,0DAA0D;QAC1D,uDAAuD;QACvD,sDAAsD;QACtD,2DAA2D;QAC3D,mEAAmE;QACnE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,cAAc,GAAG,CACrB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC3C,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC;SAC/C,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;QAC1C,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO;YACL,IAAI,kCAAO,IAAI,KAAE,QAAQ,GAAE;YAC3B,KAAK;YACL,cAAc;SACf,CAAC;IACJ,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACrB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC3C,OAAO,oBAAoB,CACzB,IAAI,CAAC,IAAI,CAAC,EAAE,EACZ,cAAoC,CACrC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAClB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO;YACL,IAAI,kCAAO,IAAI,KAAE,QAAQ,GAAE;YAC3B,KAAK;YACL,cAAc;SACf,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,6DAA6D;IAC7D,uEAAuE;IACvE,gEAAgE;AAClE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACxC,kDAAkD;IAClD,oDAAoD;IACpD,MAAM,OAAO,mBACX,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IACtB,cAAc,CAClB,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC;SACpB,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAClB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO;YACL,IAAI,kCAAO,IAAI,KAAE,SAAS,GAAE;YAC5B,KAAK;YACL,cAAc;SACf,CAAC;IACJ,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CACjB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC;SAC7C,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,EAAE,IAAI,kCAAO,IAAI,KAAE,IAAI,EAAE,QAAQ,GAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IACtE,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC1B,MAAM,OAAO,mCACR,cAAc,KACjB,GAAG,GACJ,CAAC;IACF,OAAO,UAAU,CAAC,OAAO,CAAC;SACvB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,EAAE,IAAI,kCAAO,IAAI,KAAE,MAAM,GAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAC9D,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,KAAqC,EACI,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC1B,MAAM,OAAO,mCACR,cAAc,KACjB,GAAG,GACJ,CAAC;IACF,OAAO,CACL,qBAAqB,CAAC,OAAO,CAAC;QAC5B,8CAA8C;QAC9C,kCAAkC;SACjC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,KAAK,EAAE,EAAE,CAAE,KAAK,CAAC,IAAe,KAAK,aAAa,CACpD,CAAC;IACJ,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,EAAE,IAAI,kCAAO,IAAI,KAAE,MAAM,GAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAC9D,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAC/D,CAAC;AACJ,CAAC,CAAC;AAEF,uCAAuC;AACvC,wDAAwD;AACxD,8DAA8D;AAC9D,MAAM,qBAAqB,GAAG,CAC5B,KAAqB,EACrB,KAAqC,EACrC,IAAY,EACoB,EAAE;IAClC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC9C,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9B,MAAM,
|
|
1
|
+
{"version":3,"file":"_enrichments.js","sourceRoot":"","sources":["../../../src/items/_enrichments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* concat an array of arrays
|
|
3
|
+
* excluding any elements of the top level array
|
|
4
|
+
* that are not actually arrays
|
|
5
|
+
* @param arrays An array of arrays
|
|
6
|
+
* @returns concatenated array
|
|
7
|
+
* @private
|
|
8
|
+
*/
|
|
9
|
+
export const maybeConcat = (arrays) => {
|
|
10
|
+
const result = [].concat.apply([], arrays.filter(Array.isArray));
|
|
11
|
+
return result.length ? result : undefined;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=_array.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_array.js","sourceRoot":"","sources":["../../../src/utils/_array.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAe,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
|
+
import { getEnrichmentErrors, } from "../items/_enrichments";
|
|
2
3
|
import { hubApiRequest } from "../request";
|
|
3
4
|
import { isMapOrFeatureServerUrl } from "../urls";
|
|
4
5
|
import { cloneObject } from "../util";
|
|
@@ -42,7 +43,9 @@ export var getContentEnrichments = function (item) {
|
|
|
42
43
|
// that we fetch from the Hub API, and to optionally filter by slug
|
|
43
44
|
var getHubEnrichmentsOptions = function (requestOptions, slug) {
|
|
44
45
|
var opts = cloneObject(requestOptions);
|
|
45
|
-
opts.params = __assign(__assign({}, opts.params), {
|
|
46
|
+
opts.params = __assign(__assign({}, opts.params), {
|
|
47
|
+
// TODO: we should fetch errors too
|
|
48
|
+
"fields[datasets]": "slug,boundary,extent,searchDescription,statistics" });
|
|
46
49
|
if (slug) {
|
|
47
50
|
opts.params["filter[slug]"] = slug;
|
|
48
51
|
}
|
|
@@ -89,13 +92,21 @@ export var fetchHubEnrichmentsBySlug = function (slug, requestOptions) { return
|
|
|
89
92
|
* @private
|
|
90
93
|
*/
|
|
91
94
|
export var fetchHubEnrichmentsById = function (hubId, requestOptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
92
|
-
var response;
|
|
95
|
+
var response, e_1;
|
|
93
96
|
return __generator(this, function (_a) {
|
|
94
97
|
switch (_a.label) {
|
|
95
|
-
case 0:
|
|
98
|
+
case 0:
|
|
99
|
+
_a.trys.push([0, 2, , 3]);
|
|
100
|
+
return [4 /*yield*/, hubApiRequest("/datasets/" + hubId, getHubEnrichmentsOptions(requestOptions))];
|
|
96
101
|
case 1:
|
|
97
102
|
response = _a.sent();
|
|
98
103
|
return [2 /*return*/, getDatasetEnrichments(response.data)];
|
|
104
|
+
case 2:
|
|
105
|
+
e_1 = _a.sent();
|
|
106
|
+
// dataset record not found, just log the error
|
|
107
|
+
// b/c we can still look up the item and enrichments by id
|
|
108
|
+
return [2 /*return*/, { errors: getEnrichmentErrors(e_1) }];
|
|
109
|
+
case 3: return [2 /*return*/];
|
|
99
110
|
}
|
|
100
111
|
});
|
|
101
112
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_fetch.js","sourceRoot":"","sources":["../../../src/content/_fetch.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"_fetch.js","sourceRoot":"","sources":["../../../src/content/_fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { 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";
|
|
6
|
+
import { maybeConcat } from "../utils/_array";
|
|
6
7
|
import { addContextToSlug, isSlug, parseDatasetId } from "./slugs";
|
|
7
8
|
import { fetchHubEnrichmentsById, fetchHubEnrichmentsBySlug, getContentEnrichments, } from "./_fetch";
|
|
8
9
|
import { canUseHubApiForItem } from "./_internal";
|
|
@@ -33,8 +34,9 @@ var maybeFetchLayerEnrichments = function (itemAndEnrichments, options) { return
|
|
|
33
34
|
_b.label = 3;
|
|
34
35
|
case 3:
|
|
35
36
|
layerEnrichments = _a;
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
return [2 /*return*/, __assign(__assign(__assign({}, itemAndEnrichments), layerEnrichments), {
|
|
38
|
+
// merge error arrays
|
|
39
|
+
errors: maybeConcat([itemAndEnrichments.errors, layerEnrichments === null || layerEnrichments === void 0 ? void 0 : layerEnrichments.errors]) })];
|
|
38
40
|
}
|
|
39
41
|
});
|
|
40
42
|
}); };
|
|
@@ -54,62 +56,69 @@ var fetchItemAndEnrichments = function (itemId, options) { return __awaiter(void
|
|
|
54
56
|
});
|
|
55
57
|
}); };
|
|
56
58
|
var fetchContentById = function (hubId, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
57
|
-
var itemId, _a, item, itemEnrichments, specifiedLayerId,
|
|
58
|
-
return __generator(this, function (
|
|
59
|
-
switch (
|
|
59
|
+
var itemId, _a, item, itemEnrichments, specifiedLayerId, hubEnrichments, _b, layerId;
|
|
60
|
+
return __generator(this, function (_c) {
|
|
61
|
+
switch (_c.label) {
|
|
60
62
|
case 0:
|
|
61
63
|
itemId = parseDatasetId(hubId).itemId;
|
|
62
64
|
return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
|
|
63
65
|
case 1:
|
|
64
|
-
_a =
|
|
66
|
+
_a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
|
|
65
67
|
specifiedLayerId = options && options.layerId;
|
|
66
68
|
if (!canUseHubApiForItem(item, options)) return [3 /*break*/, 3];
|
|
67
69
|
return [4 /*yield*/, fetchHubEnrichmentsById(hubId, options)];
|
|
68
70
|
case 2:
|
|
69
|
-
|
|
71
|
+
_b = _c.sent();
|
|
70
72
|
return [3 /*break*/, 4];
|
|
71
73
|
case 3:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
+
_b = {};
|
|
75
|
+
_c.label = 4;
|
|
74
76
|
case 4:
|
|
75
|
-
|
|
77
|
+
hubEnrichments = _b;
|
|
78
|
+
layerId = hubEnrichments.layerId;
|
|
76
79
|
// return a new content object composed from the item and enrichments we fetched
|
|
77
|
-
return [2 /*return*/, composeContent(item, __assign(__assign({ requestOptions: options }, itemEnrichments),
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
80
|
+
return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), {
|
|
81
|
+
// prefer specified layer id if any
|
|
82
|
+
layerId: isNil(specifiedLayerId) ? layerId : specifiedLayerId,
|
|
83
|
+
// merge error arrays
|
|
84
|
+
errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
|
|
81
85
|
}
|
|
82
86
|
});
|
|
83
87
|
}); };
|
|
84
88
|
var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
85
|
-
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId,
|
|
86
|
-
return __generator(this, function (
|
|
87
|
-
switch (
|
|
89
|
+
var hubEnrichments, itemId, layerId, _a, item, itemEnrichments, specifiedLayerId, _b;
|
|
90
|
+
return __generator(this, function (_c) {
|
|
91
|
+
switch (_c.label) {
|
|
88
92
|
case 0: return [4 /*yield*/, fetchHubEnrichmentsBySlug(fullyQualifiedSlug, options)];
|
|
89
93
|
case 1:
|
|
90
|
-
hubEnrichments =
|
|
94
|
+
hubEnrichments = _c.sent();
|
|
91
95
|
itemId = hubEnrichments.itemId;
|
|
92
96
|
layerId = hubEnrichments.layerId;
|
|
93
97
|
return [4 /*yield*/, fetchItemAndEnrichments(itemId, options)];
|
|
94
98
|
case 2:
|
|
95
|
-
_a =
|
|
99
|
+
_a = _c.sent(), item = _a.item, itemEnrichments = __rest(_a, ["item"]);
|
|
96
100
|
specifiedLayerId = options && options.layerId;
|
|
97
101
|
if (!(!isNil(specifiedLayerId) && specifiedLayerId !== layerId)) return [3 /*break*/, 4];
|
|
98
|
-
// we fetched Hub enrichments by slug for another
|
|
99
|
-
// most likely for the parent service of this layer,
|
|
100
|
-
// we need to fetch them for the specified layer instead
|
|
102
|
+
// we fetched Hub enrichments by slug for another record,
|
|
103
|
+
// most likely the record for the parent service of this layer,
|
|
104
|
+
// so we need to fetch them for the specified layer instead
|
|
101
105
|
layerId = specifiedLayerId;
|
|
106
|
+
_b = [__assign({}, hubEnrichments)];
|
|
102
107
|
return [4 /*yield*/, fetchHubEnrichmentsById(itemId + "_" + layerId, options)];
|
|
103
108
|
case 3:
|
|
104
|
-
hubEnrichments = _b.sent();
|
|
105
|
-
|
|
106
|
-
case 4:
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
109
|
+
hubEnrichments = __assign.apply(void 0, _b.concat([(_c.sent())]));
|
|
110
|
+
_c.label = 4;
|
|
111
|
+
case 4: return [2 /*return*/, composeContent(item, __assign(__assign(__assign({ requestOptions: options }, itemEnrichments), hubEnrichments), { layerId: layerId,
|
|
112
|
+
// Note that we are not extracting the slug for the specified layer.
|
|
113
|
+
// It seems that the old client composer code always populated the slug
|
|
114
|
+
// field with the slug that was passed into the function (typically the
|
|
115
|
+
// slug of the parent service). To maintain parity, we do the same here.
|
|
116
|
+
//
|
|
117
|
+
// TODO: should we prefer the slug of the fetched layer instead?
|
|
118
|
+
// return a new content object composed from the item and enrichments we fetched
|
|
119
|
+
slug: fullyQualifiedSlug,
|
|
120
|
+
// merge error arrays
|
|
121
|
+
errors: maybeConcat([itemEnrichments.errors, hubEnrichments.errors]) }))];
|
|
113
122
|
}
|
|
114
123
|
});
|
|
115
124
|
}); };
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,29 +127,44 @@ var enrichLayers = function (input) {
|
|
|
127
127
|
var handleEnrichmentError = function (error, input, opId) {
|
|
128
128
|
var data = input.data, stack = input.stack, requestOptions = input.requestOptions;
|
|
129
129
|
stack.finish(opId, { error: error });
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
:
|
|
134
|
-
|
|
135
|
-
errors.push({
|
|
136
|
-
// NOTE: for now we just return the message and type "Other"
|
|
137
|
-
// but we could later introspect for HTTP or AGO errors
|
|
138
|
-
// and/or return the status code if available
|
|
139
|
-
type: "Other",
|
|
140
|
-
message: message,
|
|
141
|
-
});
|
|
142
|
-
return { data: __assign(__assign({}, data), { errors: errors }), stack: stack, requestOptions: requestOptions };
|
|
130
|
+
return {
|
|
131
|
+
data: __assign(__assign({}, data), { errors: getEnrichmentErrors(error, data.errors) }),
|
|
132
|
+
stack: stack,
|
|
133
|
+
requestOptions: requestOptions,
|
|
134
|
+
};
|
|
143
135
|
};
|
|
144
136
|
var enrichmentOperations = {
|
|
145
137
|
groupIds: enrichGroupIds,
|
|
146
138
|
metadata: enrichMetadata,
|
|
147
139
|
ownerUser: enrichOwnerUser,
|
|
148
|
-
// TOOD: org
|
|
149
140
|
data: enrichData,
|
|
150
141
|
server: enrichServer,
|
|
151
142
|
layers: enrichLayers,
|
|
152
143
|
};
|
|
144
|
+
/**
|
|
145
|
+
* convert an error to an enrichment error info format
|
|
146
|
+
* and optionally append it to an existing array of those
|
|
147
|
+
* @param error
|
|
148
|
+
* @param errors an array of existing enrichment error info
|
|
149
|
+
* @returns a new array of enrichment error info
|
|
150
|
+
* @private
|
|
151
|
+
*/
|
|
152
|
+
export var getEnrichmentErrors = function (error, errors) {
|
|
153
|
+
if (errors === void 0) { errors = []; }
|
|
154
|
+
var message = typeof error === "string"
|
|
155
|
+
? /* istanbul ignore next our tests only throw Error objects */
|
|
156
|
+
error
|
|
157
|
+
: error.message;
|
|
158
|
+
return __spreadArrays(errors, [
|
|
159
|
+
{
|
|
160
|
+
// NOTE: for now we just return the message and type "Other"
|
|
161
|
+
// but we could later introspect for HTTP or AGO errors
|
|
162
|
+
// and/or return the status code if available
|
|
163
|
+
type: "Other",
|
|
164
|
+
message: message,
|
|
165
|
+
},
|
|
166
|
+
]);
|
|
167
|
+
};
|
|
153
168
|
/**
|
|
154
169
|
* Fetch enrichments for an item
|
|
155
170
|
* @param item
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_enrichments.js","sourceRoot":"","sources":["../../../src/items/_enrichments.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"_enrichments.js","sourceRoot":"","sources":["../../../src/items/_enrichments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* concat an array of arrays
|
|
3
|
+
* excluding any elements of the top level array
|
|
4
|
+
* that are not actually arrays
|
|
5
|
+
* @param arrays An array of arrays
|
|
6
|
+
* @returns concatenated array
|
|
7
|
+
* @private
|
|
8
|
+
*/
|
|
9
|
+
export var maybeConcat = function (arrays) {
|
|
10
|
+
var result = [].concat.apply([], arrays.filter(Array.isArray));
|
|
11
|
+
return result.length ? result : undefined;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=_array.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_array.js","sourceRoot":"","sources":["../../../src/utils/_array.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,MAAe;IACzC,IAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC,CAAC"}
|