@esri/hub-common 9.25.3 → 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/_internal.js +44 -12
- package/dist/es2017/content/_internal.js.map +1 -1
- package/dist/es2017/content/fetch.js +20 -4
- package/dist/es2017/content/fetch.js.map +1 -1
- package/dist/es2017/items/slugs.js +7 -3
- package/dist/es2017/items/slugs.js.map +1 -1
- package/dist/es2017/projects/HubProjects.js +2 -0
- package/dist/es2017/projects/HubProjects.js.map +1 -1
- package/dist/esm/content/_internal.js +44 -12
- package/dist/esm/content/_internal.js.map +1 -1
- package/dist/esm/content/fetch.js +24 -10
- package/dist/esm/content/fetch.js.map +1 -1
- package/dist/esm/items/slugs.js +7 -3
- package/dist/esm/items/slugs.js.map +1 -1
- package/dist/esm/projects/HubProjects.js +2 -0
- package/dist/esm/projects/HubProjects.js.map +1 -1
- package/dist/node/content/_internal.js +44 -12
- package/dist/node/content/_internal.js.map +1 -1
- package/dist/node/content/fetch.js +19 -3
- package/dist/node/content/fetch.js.map +1 -1
- package/dist/node/items/slugs.js +7 -3
- package/dist/node/items/slugs.js.map +1 -1
- package/dist/node/projects/HubProjects.js +2 -0
- package/dist/node/projects/HubProjects.js.map +1 -1
- package/dist/types/content/_internal.d.ts +13 -14
- package/dist/umd/common.umd.js +96 -24
- 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
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* It's probably a good pattern to add functions here first and then
|
|
9
9
|
* move them to index.ts only when they are needed by a consumer.
|
|
10
10
|
*/
|
|
11
|
-
import { parseServiceUrl
|
|
11
|
+
import { parseServiceUrl } from "@esri/arcgis-rest-feature-layer";
|
|
12
12
|
import { bBoxToPolygon, isBBox } from "../extent";
|
|
13
13
|
import { getFamily } from "./get-family";
|
|
14
14
|
import { getProp } from "../objects";
|
|
@@ -276,17 +276,49 @@ export const getItemSpatialReference = (item) => {
|
|
|
276
276
|
* @private
|
|
277
277
|
*/
|
|
278
278
|
export const getAdditionalResources = (item, metadata, requestOptions) => {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
279
|
+
const rawResources = extractRawResources(metadata);
|
|
280
|
+
return (rawResources &&
|
|
281
|
+
rawResources.map((resource) => ({
|
|
282
|
+
name: resource.orName,
|
|
283
|
+
url: getAdditionalResourceUrl(resource, item, requestOptions),
|
|
284
|
+
isDataSource: isDataSourceOfItem(resource, item),
|
|
285
|
+
})));
|
|
286
|
+
};
|
|
287
|
+
/**
|
|
288
|
+
* @private
|
|
289
|
+
*
|
|
290
|
+
* Extracts additional resources from formal item metadata.
|
|
291
|
+
* If none are available, null is returned.
|
|
292
|
+
*
|
|
293
|
+
* @param metadata the formal item metadata
|
|
294
|
+
* @returns an array of all additional resources, or null
|
|
295
|
+
*/
|
|
296
|
+
export const extractRawResources = (metadata) => {
|
|
297
|
+
const rawResources = [];
|
|
298
|
+
// The property path to additional resources should be fairly simple.
|
|
299
|
+
// In many cases, it's just `metadata.metadata.distInfo.distTranOps.onLineSrc`.
|
|
300
|
+
// However, since `distInfo`, `distTranOps` and `onLineSrc` can be either
|
|
301
|
+
// Objects OR Arrays, we have to do all this looping.
|
|
302
|
+
castToArray(getProp(metadata, "metadata.distInfo") || []).forEach((distInfo) => {
|
|
303
|
+
castToArray(distInfo.distTranOps || []).forEach((distTranOps) => {
|
|
304
|
+
castToArray(distTranOps.onLineSrc || []).forEach((onLineSrc) => {
|
|
305
|
+
rawResources.push(onLineSrc);
|
|
306
|
+
});
|
|
307
|
+
});
|
|
308
|
+
});
|
|
309
|
+
return rawResources.length ? rawResources : null;
|
|
310
|
+
};
|
|
311
|
+
/**
|
|
312
|
+
* @private
|
|
313
|
+
*
|
|
314
|
+
* Arrays are returned as-is.
|
|
315
|
+
* Objects are wrapped into a 1 element array.
|
|
316
|
+
*
|
|
317
|
+
* @param objectOrArray
|
|
318
|
+
* @returns the casted array
|
|
319
|
+
*/
|
|
320
|
+
const castToArray = (objectOrArray) => {
|
|
321
|
+
return Array.isArray(objectOrArray) ? objectOrArray : [objectOrArray];
|
|
290
322
|
};
|
|
291
323
|
/**
|
|
292
324
|
* Determines whether a raw additional resource (i.e. extracted out of formal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AASlE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,OAAoB,EACpB,QAA6B,EAC7B,EAAE;IACF,qCAAqC;IACrC,MAAM,UAAU,mCAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,KAAE,QAAQ,GAAE,CAAC;IACpE,MAAM,IAAI,mCAAQ,OAAO,CAAC,IAAI,KAAE,UAAU,GAAE,CAAC;IAC7C,MAAM,OAAO,mCAAQ,OAAO,KAAE,IAAI,GAAE,CAAC;IACrC,uCAAY,OAAO,KAAE,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAG;AAC5D,CAAC,CAAC;AAEF;;;;;GAKG;AACH,oDAAoD;AACpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAW,EAAiB,EAAE;;IAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,yDAAyD;IACzD,MAAM,UAAU,GACd,OAAA,IAAI,CAAC,UAAU,0CAAE,QAAQ;QACzB,mDAAmD;QACnD,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,QAAQ,CAAC;IACb,QAAQ,UAAU,EAAE;QAClB,KAAK,MAAM;YACT,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5D,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM;QACR,iCAAiC;KAClC;IACD,iCAAiC;IACjC,OAAO;QACL,UAAU;QACV,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,cAAmC,EAAE,EAAE;IAC9D,OAAO,cAAc,IAAI,cAAc,CAAC,QAAQ,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAW,EACX,cAAmC,EACnC,EAAE;IACF,OAAO,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,IAAW,EACX,cAAmC,EACnC,EAAE,CACF,CAAC,QAAQ,CAAC,cAAc,CAAC;IACzB,IAAI,CAAC,MAAM,KAAK,QAAQ;IACxB,IAAI,CAAC,IAAI,KAAK,KAAK;IACnB,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAY,EACZ,UAAkB,EAClB,YAAuB,EACf,EAAE;IACV,sCAAsC;IACtC,IAAI,UAAU,GAAG,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,2BAA2B,GAAG;YAClC,KAAK;YACL,SAAS;YACT,UAAU;YACV,KAAK;YACL,UAAU;SACX,CAAC;QACF,wCAAwC;QACxC,IAAI,IAAI,GAAG,UAAU,CAAC;QACtB,IAAI,MAAM,KAAK,UAAU,EAAE;YACzB,gBAAgB;YAChB,IAAI,GAAG,mBAAmB,CAAC;SAC5B;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YAC3B,oCAAoC;YACpC,iEAAiE;YACjE,4CAA4C;YAC5C,IAAI,GAAG,QAAQ,CAAC;SACjB;aAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;YAC3D,gDAAgD;YAChD,IAAI,GAAG,IAAI,MAAM,GAAG,CAAC;SACtB;QACD,UAAU,GAAG,GAAG,IAAI,IAAI,UAAU,EAAE,CAAC;KACtC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CACzC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE3C,MAAM,cAAc,GAAG,CACrB,IAAY,EACZ,UAAkB,EAClB,YAAuB,EACf,EAAE;IACV,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,sCAAsC;QACtC,gDAAgD;QAChD,+DAA+D;QAC/D,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC,UAAU,KAAI,CAAC,EAAE;YACzC,qDAAqD;YACrD,MAAM,GAAG,YAAY,UAAU,EAAE,CAAC;SACnC;QACD,wCAAwC;QACxC,MAAM,GAAG,cAAc,UAAU,QAAQ,CAAC;KAC3C;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAgBF;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,UAAgC;IAC9D,8FAA8F;IAC9F,MAAM,aAAa,GAAmB;QACpC,eAAe,EACb,4DAA4D;QAC9D,UAAU,EAAE,gDAAgD;QAC5D,OAAO,EAAE,6CAA6C;QACtD,UAAU,EAAE,gDAAgD;QAC5D,uBAAuB,EAAE,gDAAgD;QACzE,mBAAmB,EAAE,mBAAmB;KACzC,CAAC;IACF,OAAO,aAAa,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAa,EACb,UAAgC;IAEhC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACzC,OAAO,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,gCAAe,CAAA;IACf,4BAAW,CAAA;IACX,8BAAa,CAAA;AACf,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,SAAS,GAAG,GAAG,SAAS,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC;IACT,IAAI,SAAS,CAAC;IACd,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO;QACP,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC;KAChC;SAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC5C,UAAU;QACV,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC;KACjC;SAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACpD,aAAa;QACb,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC;KAC/B;SAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE;QAC/C,4CAA4C;QAC5C,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACjC,CAAC,CAAC,aAAa,CAAC,IAAI;YACpB,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC;KACvB;IACD,OAAO,IAAI,IAAI,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAClD,CAAC;AAED,0DAA0D;AAC1D,4DAA4D;AAC5D,4DAA4D;AAC5D,+DAA+D;AAC/D,iEAAiE;AACjE,sCAAsC;AACtC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAW,EAAqB,EAAE;IACxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAA2B,CAAC;IAC1D,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC7D,8DAA8D;QAC9D,OAAO,gBAAgB,CAAC;KACzB;IACD,kEAAkE;IAClE,yEAAyE;IACzE,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,QAAQ,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC,IAAI,CAAC;QAChB,CAAC,CAAC,mEAAmE;YACnE,qEAAqE;YACrE,IAAI;QACN,CAAC,CAAC,EAAE;YACF,EAAE,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAWF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAW,EACX,QAAc,EACd,cAAmC,EACT,EAAE;IAC5B,MAAM,YAAY,GAA6B,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7E,OAAO,CACL,YAAY;QACZ,YAAY,CAAC,GAAG,CACd,CAAC,QAAgC,EAA0B,EAAE,CAAC,CAAC;YAC7D,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,GAAG,EAAE,wBAAwB,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC7D,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC;SACjD,CAAC,CACH,CACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,QAAc,EACY,EAAE;IAC5B,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,qEAAqE;IACrE,+EAA+E;IAC/E,yEAAyE;IACzE,qDAAqD;IACrD,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAC/D,CAAC,QAAa,EAAE,EAAE;QAChB,WAAW,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,WAAgB,EAAE,EAAE;YACnE,WAAW,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAC9C,CAAC,SAAiC,EAAE,EAAE;gBACpC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,WAAW,GAAG,CAAC,aAAkB,EAAE,EAAE;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAAgC,EAChC,IAAW,EACX,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzD,OAAO,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,QAAgC,EAChC,IAAW,EACX,cAAmC,EACnC,EAAE;IACF,IAAI,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IAC9D,IAAI,KAAK,IAAI,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE;QAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC5B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -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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"}
|
|
@@ -63,10 +63,14 @@ export function getItemBySlug(slug, requestOptions) {
|
|
|
63
63
|
*/
|
|
64
64
|
export function findItemsBySlug(slugInfo, requestOptions) {
|
|
65
65
|
const opts = {
|
|
66
|
-
q: "",
|
|
67
66
|
filter: `typekeywords:"slug|${slugInfo.slug}"`,
|
|
68
|
-
authentication: requestOptions.authentication,
|
|
69
67
|
};
|
|
68
|
+
if (requestOptions.authentication) {
|
|
69
|
+
opts.authentication = requestOptions.authentication;
|
|
70
|
+
}
|
|
71
|
+
else if (requestOptions.portal) {
|
|
72
|
+
opts.portal = requestOptions.portal;
|
|
73
|
+
}
|
|
70
74
|
// We need to check for other items w/ a slug during
|
|
71
75
|
// the update calls. For those scenarios we are interested
|
|
72
76
|
// in any _other_ items which may have a specific slug
|
|
@@ -79,7 +83,7 @@ export function findItemsBySlug(slugInfo, requestOptions) {
|
|
|
79
83
|
return response.results;
|
|
80
84
|
})
|
|
81
85
|
.catch((e) => {
|
|
82
|
-
throw
|
|
86
|
+
throw e;
|
|
83
87
|
});
|
|
84
88
|
}
|
|
85
89
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/items/slugs.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/items/slugs.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,6 +162,8 @@ export function fetchProject(identifier, requestOptions) {
|
|
|
162
162
|
getPrms = getItemBySlug(identifier, requestOptions);
|
|
163
163
|
}
|
|
164
164
|
return getPrms.then((item) => {
|
|
165
|
+
if (!item)
|
|
166
|
+
return null;
|
|
165
167
|
return convertItemToProject(item, requestOptions);
|
|
166
168
|
});
|
|
167
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubProjects.js","sourceRoot":"","sources":["../../../src/projects/HubProjects.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HubProjects.js","sourceRoot":"","sources":["../../../src/projects/HubProjects.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { __assign } from "tslib";
|
|
|
9
9
|
* It's probably a good pattern to add functions here first and then
|
|
10
10
|
* move them to index.ts only when they are needed by a consumer.
|
|
11
11
|
*/
|
|
12
|
-
import { parseServiceUrl
|
|
12
|
+
import { parseServiceUrl } from "@esri/arcgis-rest-feature-layer";
|
|
13
13
|
import { bBoxToPolygon, isBBox } from "../extent";
|
|
14
14
|
import { getFamily } from "./get-family";
|
|
15
15
|
import { getProp } from "../objects";
|
|
@@ -281,17 +281,49 @@ export var getItemSpatialReference = function (item) {
|
|
|
281
281
|
* @private
|
|
282
282
|
*/
|
|
283
283
|
export var getAdditionalResources = function (item, metadata, requestOptions) {
|
|
284
|
-
var rawResources =
|
|
285
|
-
|
|
286
|
-
return
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
284
|
+
var rawResources = extractRawResources(metadata);
|
|
285
|
+
return (rawResources &&
|
|
286
|
+
rawResources.map(function (resource) { return ({
|
|
287
|
+
name: resource.orName,
|
|
288
|
+
url: getAdditionalResourceUrl(resource, item, requestOptions),
|
|
289
|
+
isDataSource: isDataSourceOfItem(resource, item),
|
|
290
|
+
}); }));
|
|
291
|
+
};
|
|
292
|
+
/**
|
|
293
|
+
* @private
|
|
294
|
+
*
|
|
295
|
+
* Extracts additional resources from formal item metadata.
|
|
296
|
+
* If none are available, null is returned.
|
|
297
|
+
*
|
|
298
|
+
* @param metadata the formal item metadata
|
|
299
|
+
* @returns an array of all additional resources, or null
|
|
300
|
+
*/
|
|
301
|
+
export var extractRawResources = function (metadata) {
|
|
302
|
+
var rawResources = [];
|
|
303
|
+
// The property path to additional resources should be fairly simple.
|
|
304
|
+
// In many cases, it's just `metadata.metadata.distInfo.distTranOps.onLineSrc`.
|
|
305
|
+
// However, since `distInfo`, `distTranOps` and `onLineSrc` can be either
|
|
306
|
+
// Objects OR Arrays, we have to do all this looping.
|
|
307
|
+
castToArray(getProp(metadata, "metadata.distInfo") || []).forEach(function (distInfo) {
|
|
308
|
+
castToArray(distInfo.distTranOps || []).forEach(function (distTranOps) {
|
|
309
|
+
castToArray(distTranOps.onLineSrc || []).forEach(function (onLineSrc) {
|
|
310
|
+
rawResources.push(onLineSrc);
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
return rawResources.length ? rawResources : null;
|
|
315
|
+
};
|
|
316
|
+
/**
|
|
317
|
+
* @private
|
|
318
|
+
*
|
|
319
|
+
* Arrays are returned as-is.
|
|
320
|
+
* Objects are wrapped into a 1 element array.
|
|
321
|
+
*
|
|
322
|
+
* @param objectOrArray
|
|
323
|
+
* @returns the casted array
|
|
324
|
+
*/
|
|
325
|
+
var castToArray = function (objectOrArray) {
|
|
326
|
+
return Array.isArray(objectOrArray) ? objectOrArray : [objectOrArray];
|
|
295
327
|
};
|
|
296
328
|
/**
|
|
297
329
|
* Determines whether a raw additional resource (i.e. extracted out of formal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AASlE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC;;;;;;GAMG;AACH,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,OAAoB,EACpB,QAA6B;IAE7B,qCAAqC;IACrC,IAAM,UAAU,yBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,KAAE,QAAQ,UAAA,GAAE,CAAC;IACpE,IAAM,IAAI,yBAAQ,OAAO,CAAC,IAAI,KAAE,UAAU,YAAA,GAAE,CAAC;IAC7C,IAAM,OAAO,yBAAQ,OAAO,KAAE,IAAI,MAAA,GAAE,CAAC;IACrC,6BAAY,OAAO,KAAE,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAG;AAC5D,CAAC,CAAC;AAEF;;;;;GAKG;AACH,oDAAoD;AACpD,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,IAAW;;IAC5C,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,yDAAyD;IACzD,IAAM,UAAU,GACd,OAAA,IAAI,CAAC,UAAU,0CAAE,QAAQ;QACzB,mDAAmD;QACnD,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,QAAQ,CAAC;IACb,QAAQ,UAAU,EAAE;QAClB,KAAK,MAAM;YACT,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5D,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM;QACR,iCAAiC;KAClC;IACD,iCAAiC;IACjC,OAAO;QACL,UAAU,YAAA;QACV,QAAQ,UAAA;KACT,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,IAAM,QAAQ,GAAG,UAAC,cAAmC;IAC1D,OAAO,cAAc,IAAI,cAAc,CAAC,QAAQ,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,mBAAmB,GAAG,UACjC,IAAW,EACX,cAAmC;IAEnC,OAAO,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,YAAY,GAAG,UAC1B,IAAW,EACX,cAAmC;IAEnC,OAAA,CAAC,QAAQ,CAAC,cAAc,CAAC;QACzB,IAAI,CAAC,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,KAAK,KAAK;QACnB,IAAI,CAAC,IAAI,IAAI,OAAO;AAHpB,CAGoB,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,IAAY,EACZ,UAAkB,EAClB,YAAuB;IAEvB,sCAAsC;IACtC,IAAI,UAAU,GAAG,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,EAAE;QACf,IAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAM,2BAA2B,GAAG;YAClC,KAAK;YACL,SAAS;YACT,UAAU;YACV,KAAK;YACL,UAAU;SACX,CAAC;QACF,wCAAwC;QACxC,IAAI,IAAI,GAAG,UAAU,CAAC;QACtB,IAAI,MAAM,KAAK,UAAU,EAAE;YACzB,gBAAgB;YAChB,IAAI,GAAG,mBAAmB,CAAC;SAC5B;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YAC3B,oCAAoC;YACpC,iEAAiE;YACjE,4CAA4C;YAC5C,IAAI,GAAG,QAAQ,CAAC;SACjB;aAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;YAC3D,gDAAgD;YAChD,IAAI,GAAG,MAAI,MAAM,MAAG,CAAC;SACtB;QACD,UAAU,GAAM,IAAI,SAAI,UAAY,CAAC;KACtC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,IAAY;IACrC,OAAA,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAAxC,CAAwC,CAAC;AAE3C,IAAM,cAAc,GAAG,UACrB,IAAY,EACZ,UAAkB,EAClB,YAAuB;IAEvB,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,sCAAsC;QACtC,gDAAgD;QAChD,+DAA+D;QAC/D,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC,UAAU,KAAI,CAAC,EAAE;YACzC,qDAAqD;YACrD,MAAM,GAAG,cAAY,UAAY,CAAC;SACnC;QACD,wCAAwC;QACxC,MAAM,GAAG,gBAAc,UAAU,WAAQ,CAAC;KAC3C;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAgBF;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,UAAgC;IAC9D,8FAA8F;IAC9F,IAAM,aAAa,GAAmB;QACpC,eAAe,EACb,4DAA4D;QAC9D,UAAU,EAAE,gDAAgD;QAC5D,OAAO,EAAE,6CAA6C;QACtD,UAAU,EAAE,gDAAgD;QAC5D,uBAAuB,EAAE,gDAAgD;QACzE,mBAAmB,EAAE,mBAAmB;KACzC,CAAC;IACF,OAAO,aAAa,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAa,EACb,UAAgC;IAEhC,IAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACzC,OAAO,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,gCAAe,CAAA;IACf,4BAAW,CAAA;IACX,8BAAa,CAAA;AACf,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,SAAS,GAAG,KAAG,SAAW,CAAC;IAC3B,IAAI,IAAI,CAAC;IACT,IAAI,SAAS,CAAC;IACd,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO;QACP,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC;KAChC;SAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC5C,UAAU;QACV,IAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC;KACjC;SAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACpD,aAAa;QACb,IAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC;KAC/B;SAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE;QAC/C,4CAA4C;QAC5C,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACjC,CAAC,CAAC,aAAa,CAAC,IAAI;YACpB,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC;KACvB;IACD,OAAO,IAAI,IAAI,SAAS,IAAI,EAAE,IAAI,MAAA,EAAE,SAAS,WAAA,EAAE,CAAC;AAClD,CAAC;AAED,0DAA0D;AAC1D,4DAA4D;AAC5D,4DAA4D;AAC5D,+DAA+D;AAC/D,iEAAiE;AACjE,sCAAsC;AACtC;;;;;GAKG;AACH,MAAM,CAAC,IAAM,uBAAuB,GAAG,UAAC,IAAW;IACjD,IAAM,gBAAgB,GAAG,IAAI,CAAC,gBAA2B,CAAC;IAC1D,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC7D,8DAA8D;QAC9D,OAAO,gBAAgB,CAAC;KACzB;IACD,kEAAkE;IAClE,yEAAyE;IACzE,IAAM,sBAAsB,GAAG,gBAAgB,GAAG,EAAE,CAAC;IACrD,IAAM,IAAI,GAAG,QAAQ,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC,IAAI,CAAC;QAChB,CAAC,CAAC,mEAAmE;YACnE,qEAAqE;YACrE,IAAI;QACN,CAAC,CAAC,EAAE;YACF,EAAE,IAAI,MAAA,EAAE,CAAC;AACf,CAAC,CAAC;AAWF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,IAAM,sBAAsB,GAAG,UACpC,IAAW,EACX,QAAc,EACd,cAAmC;IAEnC,IAAM,YAAY,GAA6B,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7E,OAAO,CACL,YAAY;QACZ,YAAY,CAAC,GAAG,CACd,UAAC,QAAgC,IAA6B,OAAA,CAAC;YAC7D,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,GAAG,EAAE,wBAAwB,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC7D,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC;SACjD,CAAC,EAJ4D,CAI5D,CACH,CACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,IAAM,mBAAmB,GAAG,UACjC,QAAc;IAEd,IAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,qEAAqE;IACrE,+EAA+E;IAC/E,yEAAyE;IACzE,qDAAqD;IACrD,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAC/D,UAAC,QAAa;QACZ,WAAW,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAC,WAAgB;YAC/D,WAAW,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAC9C,UAAC,SAAiC;gBAChC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,IAAM,WAAW,GAAG,UAAC,aAAkB;IACrC,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,QAAgC,EAChC,IAAW;IAEX,IAAM,UAAU,GAAG,IAAI,CAAC,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzD,OAAO,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAG,UACtC,QAAgC,EAChC,IAAW,EACX,cAAmC;IAEnC,IAAI,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC9B,IAAM,KAAK,GAAG,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IAC9D,IAAI,KAAK,IAAI,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE;QAC/C,IAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzC,IAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC5B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -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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"}
|
package/dist/esm/items/slugs.js
CHANGED
|
@@ -63,10 +63,14 @@ export function getItemBySlug(slug, requestOptions) {
|
|
|
63
63
|
*/
|
|
64
64
|
export function findItemsBySlug(slugInfo, requestOptions) {
|
|
65
65
|
var opts = {
|
|
66
|
-
q: "",
|
|
67
66
|
filter: "typekeywords:\"slug|" + slugInfo.slug + "\"",
|
|
68
|
-
authentication: requestOptions.authentication,
|
|
69
67
|
};
|
|
68
|
+
if (requestOptions.authentication) {
|
|
69
|
+
opts.authentication = requestOptions.authentication;
|
|
70
|
+
}
|
|
71
|
+
else if (requestOptions.portal) {
|
|
72
|
+
opts.portal = requestOptions.portal;
|
|
73
|
+
}
|
|
70
74
|
// We need to check for other items w/ a slug during
|
|
71
75
|
// the update calls. For those scenarios we are interested
|
|
72
76
|
// in any _other_ items which may have a specific slug
|
|
@@ -79,7 +83,7 @@ export function findItemsBySlug(slugInfo, requestOptions) {
|
|
|
79
83
|
return response.results;
|
|
80
84
|
})
|
|
81
85
|
.catch(function (e) {
|
|
82
|
-
throw
|
|
86
|
+
throw e;
|
|
83
87
|
});
|
|
84
88
|
}
|
|
85
89
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/items/slugs.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/items/slugs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvE,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,+CAA+C;AAC/C,2FAA2F;AAE3F;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,MAAc;IACzD,OAAU,MAAM,CAAC,WAAW,EAAE,SAAI,OAAO,CAAC,KAAK,CAAG,CAAC;AACrD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,YAAsB,EAAE,IAAY;IACjE,+BAA+B;IAC/B,IAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,UAAC,KAAa;QAChD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,aAAa;IACb,OAAO,CAAC,IAAI,CAAC,UAAQ,IAAM,CAAC,CAAC;IAC7B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,cAA+B;IAE/B,OAAO,eAAe,CAAC,EAAE,IAAI,MAAA,EAAE,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,UAAC,OAAO;QAC5D,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAC7B,QAGC,EACD,cAA+B;IAE/B,IAAM,IAAI,GAAG;QACX,MAAM,EAAE,yBAAsB,QAAQ,CAAC,IAAI,OAAG;KAC7B,CAAC;IAEpB,IAAI,cAAc,CAAC,cAAc,EAAE;QACjC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC;KACrD;SAAM,IAAI,cAAc,CAAC,MAAM,EAAE;QAChC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;KACrC;IAED,oDAAoD;IACpD,0DAA0D;IAC1D,sDAAsD;IACtD,4BAA4B;IAC5B,IAAI,QAAQ,CAAC,OAAO,EAAE;QACpB,IAAI,CAAC,CAAC,GAAG,YAAU,QAAQ,CAAC,OAAS,CAAC;KACvC;IACD,OAAO,WAAW,CAAC,IAAI,CAAC;SACrB,IAAI,CAAC,UAAC,QAAQ;QACb,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC1B,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,MAAM,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,aAAa,CAC3B,QAGC,EACD,cAA+B,EAC/B,IAAgB;IAAhB,qBAAA,EAAA,QAAgB;IAEhB,IAAI,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IACjC,IAAI,IAAI,EAAE;QACR,YAAY,GAAM,QAAQ,CAAC,IAAI,SAAI,IAAM,CAAC;KAC3C;IACD,OAAO,eAAe,CACpB,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,EACpD,cAAc,CACf;SACE,IAAI,CAAC,UAAC,OAAO;QACZ,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,EAAE,CAAC;YACP,OAAO,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;SACtD;aAAM;YACL,OAAO,YAAY,CAAC;SACrB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,MAAM,KAAK,CAAC,4BAA0B,CAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -181,6 +181,8 @@ export function fetchProject(identifier, requestOptions) {
|
|
|
181
181
|
getPrms = getItemBySlug(identifier, requestOptions);
|
|
182
182
|
}
|
|
183
183
|
return getPrms.then(function (item) {
|
|
184
|
+
if (!item)
|
|
185
|
+
return null;
|
|
184
186
|
return convertItemToProject(item, requestOptions);
|
|
185
187
|
});
|
|
186
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubProjects.js","sourceRoot":"","sources":["../../../src/projects/HubProjects.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HubProjects.js","sourceRoot":"","sources":["../../../src/projects/HubProjects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAdditionalResourceUrl = exports.isDataSourceOfItem = exports.getAdditionalResources = exports.getItemSpatialReference = exports.parseISODateString = exports.DatePrecision = exports.getValueFromMetadata = exports.getMetadataPath = exports.isPageType = exports.getHubRelativeUrl = exports.isProxiedCSV = exports.canUseHubApiForItem = exports.isPortal = exports.getContentBoundary = exports.setContentBoundary = void 0;
|
|
3
|
+
exports.getAdditionalResourceUrl = exports.isDataSourceOfItem = exports.extractRawResources = exports.getAdditionalResources = exports.getItemSpatialReference = exports.parseISODateString = exports.DatePrecision = exports.getValueFromMetadata = exports.getMetadataPath = exports.isPageType = exports.getHubRelativeUrl = exports.isProxiedCSV = exports.canUseHubApiForItem = exports.isPortal = exports.getContentBoundary = exports.setContentBoundary = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Use this module for functions that do not need to be used by consumers (yet),
|
|
6
6
|
* but may be shared between hub.js modules, and/or need to be tested
|
|
@@ -282,17 +282,49 @@ exports.getItemSpatialReference = (item) => {
|
|
|
282
282
|
* @private
|
|
283
283
|
*/
|
|
284
284
|
exports.getAdditionalResources = (item, metadata, requestOptions) => {
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
285
|
+
const rawResources = exports.extractRawResources(metadata);
|
|
286
|
+
return (rawResources &&
|
|
287
|
+
rawResources.map((resource) => ({
|
|
288
|
+
name: resource.orName,
|
|
289
|
+
url: exports.getAdditionalResourceUrl(resource, item, requestOptions),
|
|
290
|
+
isDataSource: exports.isDataSourceOfItem(resource, item),
|
|
291
|
+
})));
|
|
292
|
+
};
|
|
293
|
+
/**
|
|
294
|
+
* @private
|
|
295
|
+
*
|
|
296
|
+
* Extracts additional resources from formal item metadata.
|
|
297
|
+
* If none are available, null is returned.
|
|
298
|
+
*
|
|
299
|
+
* @param metadata the formal item metadata
|
|
300
|
+
* @returns an array of all additional resources, or null
|
|
301
|
+
*/
|
|
302
|
+
exports.extractRawResources = (metadata) => {
|
|
303
|
+
const rawResources = [];
|
|
304
|
+
// The property path to additional resources should be fairly simple.
|
|
305
|
+
// In many cases, it's just `metadata.metadata.distInfo.distTranOps.onLineSrc`.
|
|
306
|
+
// However, since `distInfo`, `distTranOps` and `onLineSrc` can be either
|
|
307
|
+
// Objects OR Arrays, we have to do all this looping.
|
|
308
|
+
castToArray(objects_1.getProp(metadata, "metadata.distInfo") || []).forEach((distInfo) => {
|
|
309
|
+
castToArray(distInfo.distTranOps || []).forEach((distTranOps) => {
|
|
310
|
+
castToArray(distTranOps.onLineSrc || []).forEach((onLineSrc) => {
|
|
311
|
+
rawResources.push(onLineSrc);
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
});
|
|
315
|
+
return rawResources.length ? rawResources : null;
|
|
316
|
+
};
|
|
317
|
+
/**
|
|
318
|
+
* @private
|
|
319
|
+
*
|
|
320
|
+
* Arrays are returned as-is.
|
|
321
|
+
* Objects are wrapped into a 1 element array.
|
|
322
|
+
*
|
|
323
|
+
* @param objectOrArray
|
|
324
|
+
* @returns the casted array
|
|
325
|
+
*/
|
|
326
|
+
const castToArray = (objectOrArray) => {
|
|
327
|
+
return Array.isArray(objectOrArray) ? objectOrArray : [objectOrArray];
|
|
296
328
|
};
|
|
297
329
|
/**
|
|
298
330
|
* Determines whether a raw additional resource (i.e. extracted out of formal
|