@esri/solution-simple-types 2.0.2-alpha.0 → 3.0.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/esm/dashboard.js +4 -8
- package/dist/esm/dashboard.js.map +1 -1
- package/dist/esm/helpers/convert-item-to-template.d.ts +7 -0
- package/dist/esm/helpers/convert-item-to-template.js +24 -0
- package/dist/esm/helpers/convert-item-to-template.js.map +1 -1
- package/dist/esm/helpers/create-item-from-template.js +2 -1
- package/dist/esm/helpers/create-item-from-template.js.map +1 -1
- package/dist/esm/webmap.d.ts +7 -6
- package/dist/esm/webmap.js +68 -16
- package/dist/esm/webmap.js.map +1 -1
- package/dist/umd/simple-types.umd.js +2 -2
- package/dist/umd/simple-types.umd.min.js +2 -2
- package/package.json +10 -15
package/dist/esm/dashboard.js
CHANGED
|
@@ -85,7 +85,7 @@ export function _extractDependencies(itemTemplate, templateDictionary) {
|
|
|
85
85
|
*/
|
|
86
86
|
export function _getDatasourceDependencies(obj, itemTemplate, templateDictionary) {
|
|
87
87
|
obj.datasets.forEach((dataset) => {
|
|
88
|
-
// when the datasource has an itemId
|
|
88
|
+
// when the datasource has an itemId it's an external datasource
|
|
89
89
|
const itemId = common.getProp(dataset, "dataSource.itemId");
|
|
90
90
|
if (itemId) {
|
|
91
91
|
if (itemTemplate.dependencies.indexOf(itemId) < 0) {
|
|
@@ -93,11 +93,7 @@ export function _getDatasourceDependencies(obj, itemTemplate, templateDictionary
|
|
|
93
93
|
}
|
|
94
94
|
const layerId = common.getProp(dataset, "dataSource.layerId");
|
|
95
95
|
common.cacheLayerInfo(layerId?.toString(), itemId, "", templateDictionary);
|
|
96
|
-
dataset.dataSource.itemId = common.templatizeTerm(itemId, itemId,
|
|
97
|
-
/* istanbul ignore else */
|
|
98
|
-
if (layerId !== undefined) {
|
|
99
|
-
dataset.dataSource.layerId = common.templatizeTerm(itemId, itemId, ".layer" + layerId + ".layerId");
|
|
100
|
-
}
|
|
96
|
+
dataset.dataSource.itemId = common.templatizeTerm(itemId, itemId, ".itemId");
|
|
101
97
|
}
|
|
102
98
|
});
|
|
103
99
|
}
|
|
@@ -156,7 +152,7 @@ export function _updateDatasourceReferences(objs, datasourceInfos) {
|
|
|
156
152
|
if (Array.isArray(obj.datasets)) {
|
|
157
153
|
obj.datasets.forEach((dataset) => {
|
|
158
154
|
// when the datasource has an itemId it's an external datasource
|
|
159
|
-
const itemId = common.
|
|
155
|
+
const itemId = common.cleanItemId(common.getProp(dataset, "dataSource.itemId"));
|
|
160
156
|
if (itemId) {
|
|
161
157
|
const layerId = common.cleanLayerId(common.getProp(dataset, "dataSource.layerId"));
|
|
162
158
|
datasourceInfos.some(ds => {
|
|
@@ -312,7 +308,7 @@ export function _getDatasourceInfo(obj, datasourceInfos) {
|
|
|
312
308
|
}
|
|
313
309
|
else {
|
|
314
310
|
// otherwise match the itemId and the layerId to get the correct fields and path
|
|
315
|
-
const itemId = common.
|
|
311
|
+
const itemId = common.cleanItemId(common.getProp(obj, "dataSource.itemId"));
|
|
316
312
|
const layerId = common.cleanLayerId(common.getProp(obj, "dataSource.layerId"));
|
|
317
313
|
/* istanbul ignore else */
|
|
318
314
|
if (itemId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../src/dashboard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AA2DhD;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAAkC,EAClC,kBAAuB;IAEvB,OAAO,oBAAoB,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,YAAkC,EAClC,kBAAuB;IAEvB,4BAA4B;IAC5B,MAAM,WAAW,GAAa;QAC5B,yBAAyB;QACzB,wCAAwC;QACxC,sCAAsC;QACtC,0BAA0B;QAC1B,gCAAgC;QAChC,0BAA0B;QAC1B,aAAa;QACb,4BAA4B;QAC5B,0BAA0B;QAC1B,wBAAwB;QACxB,uCAAuC;QACvC,qCAAqC;QACrC,yBAAyB;QACzB,+BAA+B;QAC/B,yBAAyB;QACzB,cAAc;QACd,oBAAoB;QACpB,cAAc;KACf,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACzB,MAAM,IAAI,GAAuB,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACpE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACjB,0BAA0B;gBAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;oBAC5B,0BAA0B;oBAC1B,IAAI,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;wBACrD,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;qBAC5C;oBACD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;iBACvE;gBACD,0BAA0B;gBAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBAC/B,0BAA0B,CAAC,GAAG,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;iBACnE;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,0BAA0B,CACxC,GAAQ,EACR,YAAkC,EAClC,kBAAuB;IAEvB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAA0B,EAAE,EAAE;QAClD,
|
|
1
|
+
{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../src/dashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,13 @@ import * as common from "@esri/solution-common";
|
|
|
26
26
|
* @returns A promise that will resolve when the template has been created
|
|
27
27
|
*/
|
|
28
28
|
export declare function convertItemToTemplate(solutionItemId: string, itemInfo: any, destAuthentication: common.UserSession, srcAuthentication: common.UserSession, templateDictionary: any): Promise<common.IItemTemplate>;
|
|
29
|
+
/**
|
|
30
|
+
* Extracts the feature layer ids for a Data Pipeline's sources and sinks.
|
|
31
|
+
*
|
|
32
|
+
* @param itemData Data Pipeline's data section
|
|
33
|
+
* @return List of feature layer ids or an empty list if there are no sources or sinks in the pipeline
|
|
34
|
+
*/
|
|
35
|
+
export declare function _getDataPipelineSourcesAndSinks(itemData: any): string[];
|
|
29
36
|
/**
|
|
30
37
|
* Encapsulates the rules for naming a form's data file.
|
|
31
38
|
* Chooses the first parameter that's defined and is not the string "undefined".
|
|
@@ -45,6 +45,7 @@ export function convertItemToTemplate(solutionItemId, itemInfo, destAuthenticati
|
|
|
45
45
|
let resourcesPromise = Promise.resolve([]);
|
|
46
46
|
switch (itemInfo.type) {
|
|
47
47
|
case "Dashboard":
|
|
48
|
+
case "Data Pipeline":
|
|
48
49
|
case "Feature Collection":
|
|
49
50
|
case "Feature Service":
|
|
50
51
|
case "Hub Initiative":
|
|
@@ -107,6 +108,10 @@ export function convertItemToTemplate(solutionItemId, itemInfo, destAuthenticati
|
|
|
107
108
|
}
|
|
108
109
|
itemTemplate.resources = resourcesResponse;
|
|
109
110
|
}
|
|
111
|
+
// Add Data Pipeline source and sink feature layers to dependencies
|
|
112
|
+
else if (itemInfo.type === "Data Pipeline") {
|
|
113
|
+
itemTemplate.dependencies = itemTemplate.dependencies.concat(_getDataPipelineSourcesAndSinks(itemDataResponse));
|
|
114
|
+
}
|
|
110
115
|
// Create the template
|
|
111
116
|
let templateModifyingPromise = Promise.resolve(itemTemplate);
|
|
112
117
|
switch (itemInfo.type) {
|
|
@@ -158,6 +163,25 @@ export function convertItemToTemplate(solutionItemId, itemInfo, destAuthenticati
|
|
|
158
163
|
});
|
|
159
164
|
});
|
|
160
165
|
}
|
|
166
|
+
/**
|
|
167
|
+
* Extracts the feature layer ids for a Data Pipeline's sources and sinks.
|
|
168
|
+
*
|
|
169
|
+
* @param itemData Data Pipeline's data section
|
|
170
|
+
* @return List of feature layer ids or an empty list if there are no sources or sinks in the pipeline
|
|
171
|
+
*/
|
|
172
|
+
export function _getDataPipelineSourcesAndSinks(itemData) {
|
|
173
|
+
const dependencies = [];
|
|
174
|
+
const sourcesAndSinks = (itemData?.inputs ?? []).concat(itemData?.outputs ?? []);
|
|
175
|
+
sourcesAndSinks.forEach(sourceOrSink => {
|
|
176
|
+
if (sourceOrSink.type === "FeatureServiceSource" || sourceOrSink.type === "FeatureServiceSink") {
|
|
177
|
+
const featureServiceId = common.getProp(sourceOrSink, "parameters.layer.value.itemId");
|
|
178
|
+
if (featureServiceId) {
|
|
179
|
+
dependencies.push(featureServiceId);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
return dependencies;
|
|
184
|
+
}
|
|
161
185
|
/**
|
|
162
186
|
* Encapsulates the rules for naming a form's data file.
|
|
163
187
|
* Chooses the first parameter that's defined and is not the string "undefined".
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-item-to-template.js","sourceRoot":"","sources":["../../../src/helpers/convert-item-to-template.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convert-item-to-template.js","sourceRoot":"","sources":["../../../src/helpers/convert-item-to-template.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,8 @@ export function createItemFromTemplate(template, templateDictionary, destination
|
|
|
52
52
|
else {
|
|
53
53
|
// Add the new item to the settings
|
|
54
54
|
templateDictionary[template.itemId] = {
|
|
55
|
-
itemId: createResponse.id
|
|
55
|
+
itemId: createResponse.id,
|
|
56
|
+
itemUrl: templateDictionary["portalBaseUrl"] + "/sharing/rest/content/items/" + createResponse.id
|
|
56
57
|
};
|
|
57
58
|
newItemTemplate.itemId = createResponse.id;
|
|
58
59
|
// Set the appItemId manually to get around cases where the path was incorrectly set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-item-from-template.js","sourceRoot":"","sources":["../../../src/helpers/create-item-from-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"create-item-from-template.js","sourceRoot":"","sources":["../../../src/helpers/create-item-from-template.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/webmap.d.ts
CHANGED
|
@@ -32,7 +32,7 @@ export declare function convertItemToTemplate(itemTemplate: common.IItemTemplate
|
|
|
32
32
|
* @returns List of dependencies ids and url/itemId hash
|
|
33
33
|
* @private
|
|
34
34
|
*/
|
|
35
|
-
export declare function _extractDependencies(itemTemplate: common.IItemTemplate, authentication: common.UserSession): Promise<
|
|
35
|
+
export declare function _extractDependencies(itemTemplate: common.IItemTemplate, authentication: common.UserSession): Promise<common.IWebmapDependencies>;
|
|
36
36
|
/**
|
|
37
37
|
* Remove the initialState prop from webmaps saved from the new map viewer.
|
|
38
38
|
* This allows the map to use the item extent property that we templatize.
|
|
@@ -47,23 +47,24 @@ export declare function _excludeInitialState(data: any): void;
|
|
|
47
47
|
/**
|
|
48
48
|
* Extracts the AGOL itemId for each layer or table object in a list using the url.
|
|
49
49
|
*
|
|
50
|
-
* @param layerList List of map layers or tables
|
|
50
|
+
* @param layerList List of map layers or tables; supported vector tile layers have their styleUrls templatized
|
|
51
51
|
* @param dependencies Current list of dependencies
|
|
52
52
|
* @param authentication Credentials for any requests
|
|
53
|
-
* @returns
|
|
53
|
+
* @returns Updated list of dependencies ids, url/itemId hash (for feature layers),
|
|
54
|
+
* and id/styleUrl hash (for vector tile layers)
|
|
54
55
|
* @private
|
|
55
56
|
*/
|
|
56
|
-
export declare function _getLayerIds(layerList: any[], dependencies: string[], authentication: common.UserSession): Promise<
|
|
57
|
+
export declare function _getLayerIds(layerList: any[], dependencies: string[], authentication: common.UserSession): Promise<common.IWebmapDependencies>;
|
|
57
58
|
/**
|
|
58
59
|
* Templatizes the url and item id for layers or tables within the webmap.
|
|
59
60
|
*
|
|
60
61
|
* @param layerList List of map layers or tables
|
|
61
|
-
* @param urlHash Lookup object for analysis layers
|
|
62
|
+
* @param urlHash Lookup object for analysis layers; hash from URL to AGO item id
|
|
62
63
|
* @param templateDictionary Hash of key details used for variable replacement
|
|
63
64
|
* @returns void
|
|
64
65
|
* @private
|
|
65
66
|
*/
|
|
66
|
-
export declare function _templatizeWebmapLayerIdsAndUrls(layerList: any[], urlHash:
|
|
67
|
+
export declare function _templatizeWebmapLayerIdsAndUrls(layerList: any[], urlHash: common.IKeyedStrings, templateDictionary: any): void;
|
|
67
68
|
/**
|
|
68
69
|
* Templatize field references.
|
|
69
70
|
*
|
package/dist/esm/webmap.js
CHANGED
|
@@ -20,6 +20,11 @@ import * as common from "@esri/solution-common";
|
|
|
20
20
|
* @private
|
|
21
21
|
*/
|
|
22
22
|
const WEBMAP_APP_URL_PART = "home/webmap/viewer.html?webmap=";
|
|
23
|
+
/**
|
|
24
|
+
* A flag inserted used as a vector tile layer's styleUrl to indicate that the layer is unsupported and should
|
|
25
|
+
* be removed.
|
|
26
|
+
*/
|
|
27
|
+
const unsupportedTileLayerUrl = "unsupported";
|
|
23
28
|
// ------------------------------------------------------------------------------------------------------------------ //
|
|
24
29
|
/**
|
|
25
30
|
* Converts an AGOL webmap item to a template.
|
|
@@ -42,7 +47,18 @@ export function convertItemToTemplate(itemTemplate, destAuthentication, srcAuthe
|
|
|
42
47
|
itemTemplate.dependencies = results.dependencies;
|
|
43
48
|
// Templatize the map layer ids after we've extracted them as dependencies
|
|
44
49
|
if (itemTemplate.data) {
|
|
45
|
-
|
|
50
|
+
const baseMapLayers = itemTemplate.data.baseMap?.baseMapLayers;
|
|
51
|
+
if (baseMapLayers) {
|
|
52
|
+
itemTemplate.data.baseMap.baseMapLayers =
|
|
53
|
+
baseMapLayers.filter(layer => layer.styleUrl !== unsupportedTileLayerUrl);
|
|
54
|
+
_templatizeWebmapLayerIdsAndUrls(itemTemplate.data.baseMap.baseMapLayers, results.urlHash, templateDictionary);
|
|
55
|
+
}
|
|
56
|
+
const operationalLayers = itemTemplate.data.operationalLayers;
|
|
57
|
+
if (operationalLayers) {
|
|
58
|
+
itemTemplate.data.operationalLayers =
|
|
59
|
+
operationalLayers.filter(layer => layer.styleUrl !== unsupportedTileLayerUrl);
|
|
60
|
+
_templatizeWebmapLayerIdsAndUrls(itemTemplate.data.operationalLayers, results.urlHash, templateDictionary);
|
|
61
|
+
}
|
|
46
62
|
_templatizeWebmapLayerIdsAndUrls(itemTemplate.data.tables, results.urlHash, templateDictionary);
|
|
47
63
|
// Exclude intialState
|
|
48
64
|
_excludeInitialState(itemTemplate.data);
|
|
@@ -63,9 +79,10 @@ export function _extractDependencies(itemTemplate, authentication) {
|
|
|
63
79
|
return new Promise((resolve, reject) => {
|
|
64
80
|
const dependencies = [];
|
|
65
81
|
if (itemTemplate.data) {
|
|
66
|
-
const
|
|
82
|
+
const basemapLayers = itemTemplate.data.baseMap?.baseMapLayers || [];
|
|
83
|
+
const opLayers = itemTemplate.data.operationalLayers || [];
|
|
67
84
|
const tables = itemTemplate.data.tables || [];
|
|
68
|
-
const layersAndTables =
|
|
85
|
+
const layersAndTables = basemapLayers.concat(opLayers).concat(tables);
|
|
69
86
|
_getLayerIds(layersAndTables, dependencies, authentication).then(results => {
|
|
70
87
|
resolve(results);
|
|
71
88
|
}, e => reject(common.fail(e)));
|
|
@@ -94,10 +111,11 @@ export function _excludeInitialState(data) {
|
|
|
94
111
|
/**
|
|
95
112
|
* Extracts the AGOL itemId for each layer or table object in a list using the url.
|
|
96
113
|
*
|
|
97
|
-
* @param layerList List of map layers or tables
|
|
114
|
+
* @param layerList List of map layers or tables; supported vector tile layers have their styleUrls templatized
|
|
98
115
|
* @param dependencies Current list of dependencies
|
|
99
116
|
* @param authentication Credentials for any requests
|
|
100
|
-
* @returns
|
|
117
|
+
* @returns Updated list of dependencies ids, url/itemId hash (for feature layers),
|
|
118
|
+
* and id/styleUrl hash (for vector tile layers)
|
|
101
119
|
* @private
|
|
102
120
|
*/
|
|
103
121
|
export function _getLayerIds(layerList, dependencies, authentication) {
|
|
@@ -110,7 +128,16 @@ export function _getLayerIds(layerList, dependencies, authentication) {
|
|
|
110
128
|
const layerPromises = [];
|
|
111
129
|
const layerChecks = {};
|
|
112
130
|
const layers = layerList.filter(layer => {
|
|
113
|
-
|
|
131
|
+
// Test for Vector Tile Layers
|
|
132
|
+
if (layer.itemId && layer.layerType === "VectorTileLayer") {
|
|
133
|
+
// Fetch the item so that we can check if it has the typeKeyword "Vector Tile Style Editor", which ensures
|
|
134
|
+
// that the user has edited the style and it is something that could be reasonably be packaged with the
|
|
135
|
+
// solution
|
|
136
|
+
layerPromises.push(common.getItemBase(layer.itemId, authentication));
|
|
137
|
+
return true;
|
|
138
|
+
// Handle a feature server layer
|
|
139
|
+
}
|
|
140
|
+
else if (layer.url && layer.url.indexOf("{{velocityUrl}}") < 0) {
|
|
114
141
|
const results = /.+FeatureServer/g.exec(layer.url);
|
|
115
142
|
const baseUrl = Array.isArray(results) && results.length > 0 ? results[0] : undefined;
|
|
116
143
|
if (baseUrl) {
|
|
@@ -124,16 +151,35 @@ export function _getLayerIds(layerList, dependencies, authentication) {
|
|
|
124
151
|
else {
|
|
125
152
|
return false;
|
|
126
153
|
}
|
|
154
|
+
// This layer is not a dependency
|
|
127
155
|
}
|
|
128
156
|
else {
|
|
129
157
|
return false;
|
|
130
158
|
}
|
|
131
159
|
});
|
|
160
|
+
// We have a mix of Vector Tile Layer item base requests and Feature Server info requests
|
|
132
161
|
if (layerPromises.length > 0) {
|
|
133
|
-
Promise.all(layerPromises).then(
|
|
134
|
-
|
|
135
|
-
if (
|
|
136
|
-
const
|
|
162
|
+
Promise.all(layerPromises).then((responses) => {
|
|
163
|
+
responses.forEach((response, i) => {
|
|
164
|
+
if (layers[i].layerType === "VectorTileLayer") {
|
|
165
|
+
const typeKeywords = common.getProp(response, "typeKeywords");
|
|
166
|
+
if (typeKeywords && typeKeywords.includes("Vector Tile Style Editor")) {
|
|
167
|
+
// Vector tiles edited by the style editor
|
|
168
|
+
if (dependencies.indexOf(response.id) < 0) {
|
|
169
|
+
dependencies.push(response.id);
|
|
170
|
+
}
|
|
171
|
+
// Templatize the URL to the style resource
|
|
172
|
+
const iSuffix = layers[i].styleUrl.indexOf(response.id) + response.id.length;
|
|
173
|
+
layers[i].styleUrl = common.templatizeTerm(layers[i].styleUrl.replace(layers[i].styleUrl.substring(0, iSuffix), response.id), response.id, ".itemUrl");
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
// Unsupported vector tiles
|
|
177
|
+
layers[i].styleUrl = unsupportedTileLayerUrl;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
else if (common.getProp(response, "serviceItemId")) {
|
|
181
|
+
// Feature Service
|
|
182
|
+
const id = response.serviceItemId;
|
|
137
183
|
if (dependencies.indexOf(id) < 0) {
|
|
138
184
|
dependencies.push(id);
|
|
139
185
|
}
|
|
@@ -141,15 +187,15 @@ export function _getLayerIds(layerList, dependencies, authentication) {
|
|
|
141
187
|
}
|
|
142
188
|
});
|
|
143
189
|
resolve({
|
|
144
|
-
dependencies
|
|
145
|
-
urlHash
|
|
190
|
+
dependencies,
|
|
191
|
+
urlHash
|
|
146
192
|
});
|
|
147
193
|
}, e => reject(common.fail(e)));
|
|
148
194
|
}
|
|
149
195
|
else {
|
|
150
196
|
resolve({
|
|
151
|
-
dependencies
|
|
152
|
-
urlHash
|
|
197
|
+
dependencies,
|
|
198
|
+
urlHash
|
|
153
199
|
});
|
|
154
200
|
}
|
|
155
201
|
});
|
|
@@ -158,14 +204,20 @@ export function _getLayerIds(layerList, dependencies, authentication) {
|
|
|
158
204
|
* Templatizes the url and item id for layers or tables within the webmap.
|
|
159
205
|
*
|
|
160
206
|
* @param layerList List of map layers or tables
|
|
161
|
-
* @param urlHash Lookup object for analysis layers
|
|
207
|
+
* @param urlHash Lookup object for analysis layers; hash from URL to AGO item id
|
|
162
208
|
* @param templateDictionary Hash of key details used for variable replacement
|
|
163
209
|
* @returns void
|
|
164
210
|
* @private
|
|
165
211
|
*/
|
|
166
212
|
export function _templatizeWebmapLayerIdsAndUrls(layerList = [], urlHash, templateDictionary) {
|
|
167
213
|
layerList.forEach((layer) => {
|
|
168
|
-
|
|
214
|
+
// Test for Vector Tile Layers
|
|
215
|
+
if (layer.itemId && layer.layerType === "VectorTileLayer") {
|
|
216
|
+
// No further test needed: we've already pruned out unsupported vector tile layers
|
|
217
|
+
layer.itemId = common.templatizeTerm(layer.itemId, layer.itemId, ".itemId");
|
|
218
|
+
// Handle a feature server layer
|
|
219
|
+
}
|
|
220
|
+
else if (layer.url) {
|
|
169
221
|
const layerId = layer.url.substr(layer.url.lastIndexOf("/") + 1);
|
|
170
222
|
const id = Object.keys(urlHash).indexOf(layer.url) > -1
|
|
171
223
|
? urlHash[layer.url]
|
package/dist/esm/webmap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webmap.js","sourceRoot":"","sources":["../../src/webmap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAEhD;;;;GAIG;AACH,MAAM,mBAAmB,GAAW,iCAAiC,CAAC;AAEtE,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAAkC,EAClC,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,OAAO,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3D,yBAAyB;QACzB,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACtE,mBAAmB;gBACnB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB;QAEjE,uBAAuB;QACvB,oBAAoB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,IAAI,CACxD,CAAC,
|
|
1
|
+
{"version":3,"file":"webmap.js","sourceRoot":"","sources":["../../src/webmap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* @esri/solution-simple-types -
|
|
2
|
+
* @esri/solution-simple-types - v1.7.0 - Apache-2.0
|
|
3
3
|
* Copyright (c) 2018-2023 Esri, Inc.
|
|
4
|
-
*
|
|
4
|
+
* Fri Apr 28 2023 11:22:29 GMT-0700 (Pacific Daylight Time)
|
|
5
5
|
*
|
|
6
6
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
* you may not use this file except in compliance with the License.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* @esri/solution-simple-types -
|
|
2
|
+
* @esri/solution-simple-types - v1.7.0 - Apache-2.0
|
|
3
3
|
* Copyright (c) 2018-2023 Esri, Inc.
|
|
4
|
-
*
|
|
4
|
+
* Fri Apr 28 2023 11:22:34 GMT-0700 (Pacific Daylight Time)
|
|
5
5
|
*
|
|
6
6
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
* you may not use this file except in compliance with the License.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/solution-simple-types",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"description": "Manages the creation and deployment of simple item types for @esri/solution.js.",
|
|
5
5
|
"main": "dist/node/index.js",
|
|
6
6
|
"unpkg": "dist/umd/simple-types.umd.min.js",
|
|
@@ -18,12 +18,11 @@
|
|
|
18
18
|
"@esri/arcgis-rest-portal": "~3.5.0",
|
|
19
19
|
"@esri/arcgis-rest-request": "~3.5.0",
|
|
20
20
|
"@esri/arcgis-rest-service-admin": "~3.5.0",
|
|
21
|
-
"@esri/hub-common": "^12.14.0",
|
|
22
21
|
"@esri/hub-teams": "^12.4.1",
|
|
23
|
-
"@esri/solution-common": "^
|
|
24
|
-
"@esri/solution-feature-layer": "^
|
|
25
|
-
"@esri/solution-file": "^
|
|
26
|
-
"@esri/solution-group": "^
|
|
22
|
+
"@esri/solution-common": "^3.0.1",
|
|
23
|
+
"@esri/solution-feature-layer": "^3.0.1",
|
|
24
|
+
"@esri/solution-file": "^3.0.1",
|
|
25
|
+
"@esri/solution-group": "^3.0.1",
|
|
27
26
|
"rollup": "2.79.1"
|
|
28
27
|
},
|
|
29
28
|
"peerDependencies": {
|
|
@@ -32,21 +31,17 @@
|
|
|
32
31
|
"@esri/arcgis-rest-portal": "~3.5.0",
|
|
33
32
|
"@esri/arcgis-rest-request": "~3.5.0",
|
|
34
33
|
"@esri/arcgis-rest-service-admin": "~3.5.0",
|
|
35
|
-
"@esri/hub-common": "^12.14.0",
|
|
36
34
|
"@esri/hub-teams": "^12.4.1"
|
|
37
35
|
},
|
|
38
36
|
"dependencies": {
|
|
37
|
+
"@esri/hub-common": "^12.37.1",
|
|
38
|
+
"@esri/hub-sites": "^12.6.0",
|
|
39
39
|
"tslib": "1.14.1"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"prepare": "npm run build",
|
|
43
|
-
"build": "
|
|
44
|
-
"build:
|
|
45
|
-
"build:umd": "rollup -c ../../umd-base-profile.js && rollup -c ../../umd-production-profile.js",
|
|
46
|
-
"build:node": "tsc -p ./tsconfig.json --module commonjs --outDir ./dist/node",
|
|
47
|
-
"dev:esm": "tsc -w --module esnext --outDir ./dist/esm --declaration",
|
|
48
|
-
"dev:umd": "rollup -w -c ../../umd-base-profile.js",
|
|
49
|
-
"dev:node": "tsc -w --module commonjs --outDir ./dist/node",
|
|
43
|
+
"build": "tsc -p ./tsconfig.json --module esnext --outDir ./dist/esm --declaration",
|
|
44
|
+
"build:dev": "tsc -w --module esnext --outDir ./dist/esm --declaration",
|
|
50
45
|
"getupdates": "npm-check-updates --upgrade",
|
|
51
46
|
"tsc:v": "tsc -v"
|
|
52
47
|
},
|
|
@@ -90,5 +85,5 @@
|
|
|
90
85
|
"esri",
|
|
91
86
|
"ES6"
|
|
92
87
|
],
|
|
93
|
-
"gitHead": "
|
|
88
|
+
"gitHead": "86394b7a82adae26897cb2ec2aade0aa05e70e41"
|
|
94
89
|
}
|