@esri/solution-web-tool 5.5.0 → 5.6.0
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.
|
@@ -49,7 +49,7 @@ exports.convertItemToTemplate = convertItemToTemplate;
|
|
|
49
49
|
* @returns {Promise<ICreateItemFromTemplateResponse>}
|
|
50
50
|
*/
|
|
51
51
|
function createItemFromTemplate(template, templateDictionary, destinationAuthentication, itemProgressCallback) {
|
|
52
|
-
return new Promise(resolve => {
|
|
52
|
+
return new Promise((resolve) => {
|
|
53
53
|
// Interrupt process if progress callback returns `false`
|
|
54
54
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Started, 0)) {
|
|
55
55
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Ignored, 0);
|
|
@@ -62,19 +62,19 @@ function createItemFromTemplate(template, templateDictionary, destinationAuthent
|
|
|
62
62
|
if (template.item.thumbnail) {
|
|
63
63
|
newItemTemplate.item.thumbnail = template.item.thumbnail;
|
|
64
64
|
}
|
|
65
|
-
createWebTool(newItemTemplate, templateDictionary, destinationAuthentication).then(createResponse => {
|
|
65
|
+
createWebTool(newItemTemplate, templateDictionary, destinationAuthentication).then((createResponse) => {
|
|
66
66
|
// Interrupt process if progress callback returns `false`
|
|
67
67
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Created, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
68
68
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
69
|
-
common
|
|
70
|
-
.removeItem(createResponse.itemId, destinationAuthentication)
|
|
71
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
69
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
72
70
|
}
|
|
73
71
|
else {
|
|
74
72
|
// Add the new item to the settings
|
|
75
73
|
templateDictionary[template.itemId] = {
|
|
76
74
|
itemId: createResponse.itemId,
|
|
77
|
-
itemUrl: templateDictionary["portalBaseUrl"] +
|
|
75
|
+
itemUrl: templateDictionary["portalBaseUrl"] +
|
|
76
|
+
"/sharing/rest/content/items/" +
|
|
77
|
+
createResponse.itemId,
|
|
78
78
|
};
|
|
79
79
|
newItemTemplate.itemId = createResponse.itemId;
|
|
80
80
|
newItemTemplate.item.id = createResponse.itemId;
|
|
@@ -83,43 +83,35 @@ function createItemFromTemplate(template, templateDictionary, destinationAuthent
|
|
|
83
83
|
// Update the template again now that we have the new item id
|
|
84
84
|
newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
|
|
85
85
|
// Update the item with snippet, description, popupInfo, etc.
|
|
86
|
-
common
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
common
|
|
87
|
+
.updateItemExtended({
|
|
88
|
+
...newItemTemplate.item,
|
|
89
|
+
}, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
|
|
90
|
+
.then(() => {
|
|
89
91
|
// Interrupt process if progress callback returns `false`
|
|
90
92
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
91
93
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
92
|
-
common
|
|
93
|
-
.removeItem(createResponse.itemId, destinationAuthentication)
|
|
94
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
94
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
97
|
// Update the template to match what we've stored in AGO
|
|
98
|
-
common
|
|
99
|
-
.getItemBase(newItemTemplate.itemId, destinationAuthentication)
|
|
100
|
-
.then(updatedItem => {
|
|
98
|
+
common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
|
|
101
99
|
newItemTemplate.item = updatedItem;
|
|
102
100
|
resolve({
|
|
103
101
|
item: newItemTemplate,
|
|
104
102
|
id: createResponse.itemId,
|
|
105
103
|
type: newItemTemplate.type,
|
|
106
|
-
postProcess: false
|
|
104
|
+
postProcess: false,
|
|
107
105
|
});
|
|
108
106
|
}, () => {
|
|
109
107
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
110
|
-
common
|
|
111
|
-
|
|
112
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
113
|
-
} // fails to update item
|
|
114
|
-
);
|
|
108
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
109
|
+
});
|
|
115
110
|
}
|
|
116
111
|
}, () => {
|
|
117
112
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
118
|
-
common
|
|
119
|
-
|
|
120
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
121
|
-
} // fails to update item
|
|
122
|
-
);
|
|
113
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
114
|
+
});
|
|
123
115
|
}
|
|
124
116
|
}, () => {
|
|
125
117
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
@@ -143,34 +135,36 @@ function createWebTool(template, templateDictionary, destinationAuthentication)
|
|
|
143
135
|
const notebookUrl = templateDictionary.portalUrls.notebooks.https[0];
|
|
144
136
|
const url = `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`;
|
|
145
137
|
const params = {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
"
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
138
|
+
serviceProperties: {
|
|
139
|
+
description: template.item.description,
|
|
140
|
+
provider: "notebooks",
|
|
141
|
+
type: "GPServer",
|
|
142
|
+
jsonProperties: {
|
|
143
|
+
title: template.item.title,
|
|
144
|
+
notebookId: template.data.notebookId,
|
|
145
|
+
tasks: [
|
|
146
|
+
{
|
|
147
|
+
type: "notebook",
|
|
148
|
+
name: template.data.name,
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
},
|
|
152
|
+
},
|
|
159
153
|
};
|
|
160
154
|
const requestOptions = {
|
|
161
155
|
httpMethod: "POST",
|
|
162
156
|
authentication: destinationAuthentication,
|
|
163
157
|
params,
|
|
164
158
|
headers: {
|
|
165
|
-
Accept: "application/json",
|
|
166
|
-
Authorization: `Bearer ${destinationAuthentication.token}`,
|
|
159
|
+
"Accept": "application/json",
|
|
160
|
+
"Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
167
161
|
"Content-Type": "application/json",
|
|
168
|
-
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}
|
|
162
|
+
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
169
163
|
},
|
|
170
164
|
};
|
|
171
165
|
(0, arcgis_rest_request_1.request)(url, requestOptions).then((response) => {
|
|
172
166
|
resolve(response);
|
|
173
|
-
}, e => {
|
|
167
|
+
}, (e) => {
|
|
174
168
|
reject(e);
|
|
175
169
|
});
|
|
176
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH;;;;GAIG;AAEH,sEAAgD;AAChD,uEAA0D;AAC1D,mEAAqE;AAErE;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,QAAa,EACb,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,2BAA2B;IAC3B,OAAO,mCAAW,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentic
|
|
|
44
44
|
* @returns {Promise<ICreateItemFromTemplateResponse>}
|
|
45
45
|
*/
|
|
46
46
|
export function createItemFromTemplate(template, templateDictionary, destinationAuthentication, itemProgressCallback) {
|
|
47
|
-
return new Promise(resolve => {
|
|
47
|
+
return new Promise((resolve) => {
|
|
48
48
|
// Interrupt process if progress callback returns `false`
|
|
49
49
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Started, 0)) {
|
|
50
50
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Ignored, 0);
|
|
@@ -57,19 +57,19 @@ export function createItemFromTemplate(template, templateDictionary, destination
|
|
|
57
57
|
if (template.item.thumbnail) {
|
|
58
58
|
newItemTemplate.item.thumbnail = template.item.thumbnail;
|
|
59
59
|
}
|
|
60
|
-
createWebTool(newItemTemplate, templateDictionary, destinationAuthentication).then(createResponse => {
|
|
60
|
+
createWebTool(newItemTemplate, templateDictionary, destinationAuthentication).then((createResponse) => {
|
|
61
61
|
// Interrupt process if progress callback returns `false`
|
|
62
62
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Created, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
63
63
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
64
|
-
common
|
|
65
|
-
.removeItem(createResponse.itemId, destinationAuthentication)
|
|
66
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
64
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
67
65
|
}
|
|
68
66
|
else {
|
|
69
67
|
// Add the new item to the settings
|
|
70
68
|
templateDictionary[template.itemId] = {
|
|
71
69
|
itemId: createResponse.itemId,
|
|
72
|
-
itemUrl: templateDictionary["portalBaseUrl"] +
|
|
70
|
+
itemUrl: templateDictionary["portalBaseUrl"] +
|
|
71
|
+
"/sharing/rest/content/items/" +
|
|
72
|
+
createResponse.itemId,
|
|
73
73
|
};
|
|
74
74
|
newItemTemplate.itemId = createResponse.itemId;
|
|
75
75
|
newItemTemplate.item.id = createResponse.itemId;
|
|
@@ -78,43 +78,35 @@ export function createItemFromTemplate(template, templateDictionary, destination
|
|
|
78
78
|
// Update the template again now that we have the new item id
|
|
79
79
|
newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
|
|
80
80
|
// Update the item with snippet, description, popupInfo, etc.
|
|
81
|
-
common
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
common
|
|
82
|
+
.updateItemExtended({
|
|
83
|
+
...newItemTemplate.item,
|
|
84
|
+
}, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
|
|
85
|
+
.then(() => {
|
|
84
86
|
// Interrupt process if progress callback returns `false`
|
|
85
87
|
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
86
88
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
87
|
-
common
|
|
88
|
-
.removeItem(createResponse.itemId, destinationAuthentication)
|
|
89
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
89
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
92
92
|
// Update the template to match what we've stored in AGO
|
|
93
|
-
common
|
|
94
|
-
.getItemBase(newItemTemplate.itemId, destinationAuthentication)
|
|
95
|
-
.then(updatedItem => {
|
|
93
|
+
common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
|
|
96
94
|
newItemTemplate.item = updatedItem;
|
|
97
95
|
resolve({
|
|
98
96
|
item: newItemTemplate,
|
|
99
97
|
id: createResponse.itemId,
|
|
100
98
|
type: newItemTemplate.type,
|
|
101
|
-
postProcess: false
|
|
99
|
+
postProcess: false,
|
|
102
100
|
});
|
|
103
101
|
}, () => {
|
|
104
102
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
105
|
-
common
|
|
106
|
-
|
|
107
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
108
|
-
} // fails to update item
|
|
109
|
-
);
|
|
103
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
104
|
+
});
|
|
110
105
|
}
|
|
111
106
|
}, () => {
|
|
112
107
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
113
|
-
common
|
|
114
|
-
|
|
115
|
-
.then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
116
|
-
} // fails to update item
|
|
117
|
-
);
|
|
108
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
109
|
+
});
|
|
118
110
|
}
|
|
119
111
|
}, () => {
|
|
120
112
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
@@ -137,34 +129,36 @@ export function createWebTool(template, templateDictionary, destinationAuthentic
|
|
|
137
129
|
const notebookUrl = templateDictionary.portalUrls.notebooks.https[0];
|
|
138
130
|
const url = `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`;
|
|
139
131
|
const params = {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
"
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
132
|
+
serviceProperties: {
|
|
133
|
+
description: template.item.description,
|
|
134
|
+
provider: "notebooks",
|
|
135
|
+
type: "GPServer",
|
|
136
|
+
jsonProperties: {
|
|
137
|
+
title: template.item.title,
|
|
138
|
+
notebookId: template.data.notebookId,
|
|
139
|
+
tasks: [
|
|
140
|
+
{
|
|
141
|
+
type: "notebook",
|
|
142
|
+
name: template.data.name,
|
|
143
|
+
},
|
|
144
|
+
],
|
|
145
|
+
},
|
|
146
|
+
},
|
|
153
147
|
};
|
|
154
148
|
const requestOptions = {
|
|
155
149
|
httpMethod: "POST",
|
|
156
150
|
authentication: destinationAuthentication,
|
|
157
151
|
params,
|
|
158
152
|
headers: {
|
|
159
|
-
Accept: "application/json",
|
|
160
|
-
Authorization: `Bearer ${destinationAuthentication.token}`,
|
|
153
|
+
"Accept": "application/json",
|
|
154
|
+
"Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
161
155
|
"Content-Type": "application/json",
|
|
162
|
-
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}
|
|
156
|
+
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
163
157
|
},
|
|
164
158
|
};
|
|
165
159
|
request(url, requestOptions).then((response) => {
|
|
166
160
|
resolve(response);
|
|
167
|
-
}, e => {
|
|
161
|
+
}, (e) => {
|
|
168
162
|
reject(e);
|
|
169
163
|
});
|
|
170
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAmB,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAErE;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,QAAa,EACb,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,2BAA2B;IAC3B,OAAO,WAAW,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAmB,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAErE;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,QAAa,EACb,kBAAsC,EACtC,iBAAqC,EACrC,kBAAuB;IAEvB,2BAA2B;IAC3B,OAAO,WAAW,CAAC,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;AAChH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAA8B,EAC9B,kBAAuB,EACvB,yBAA6C,EAC7C,oBAAkD;IAElD,OAAO,IAAI,OAAO,CAAyC,CAAC,OAAO,EAAE,EAAE;QACrE,yDAAyD;QACzD,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;YACjF,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,4DAA4D;YAC5D,IAAI,eAAe,GAAyB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACzE,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;YAEhF,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE;gBAC3B,eAAe,CAAC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;aAC1D;YAED,aAAa,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAAyB,CAAC,CAAC,IAAI,CAChF,CAAC,cAAc,EAAE,EAAE;gBACjB,yDAAyD;gBACzD,IACE,CAAC,oBAAoB,CACnB,QAAQ,CAAC,MAAM,EACf,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAClC,QAAQ,CAAC,6BAA6B,GAAG,CAAC,EAC1C,cAAc,CAAC,MAAM,CACtB,EACD;oBACA,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBAC/E,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,IAAI,CACtE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAClE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;iBACH;qBAAM;oBACL,mCAAmC;oBACnC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG;wBACpC,MAAM,EAAE,cAAc,CAAC,MAAM;wBAC7B,OAAO,EACJ,kBAAkB,CAAC,eAAe,CAAY;4BAC/C,8BAA8B;4BAC9B,cAAc,CAAC,MAAM;qBACxB,CAAC;oBACF,eAAe,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;oBAC/C,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC;oBAChD,eAAe,CAAC,IAAI,GAAG,EAAE,CAAC;oBAC1B,OAAO,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC;oBAEtC,6DAA6D;oBAC7D,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;oBAEhF,6DAA6D;oBAC7D,MAAM;yBACH,kBAAkB,CACjB;wBACE,GAAG,eAAe,CAAC,IAAI;qBACxB,EACD,eAAe,CAAC,IAAI,EACpB,yBAAyB,EACzB,QAAQ,CAAC,IAAI,CAAC,SAAS,EACvB,SAAS,EACT,kBAAkB,CACnB;yBACA,IAAI,CACH,GAAG,EAAE;wBACH,yDAAyD;wBACzD,IACE,CAAC,oBAAoB,CACnB,QAAQ,CAAC,MAAM,EACf,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EACnC,QAAQ,CAAC,6BAA6B,GAAG,CAAC,EAC1C,cAAc,CAAC,MAAM,CACtB,EACD;4BACA,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;4BAC/E,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,IAAI,CACtE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAClE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;yBACH;6BAAM;4BACL,wDAAwD;4BACxD,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,IAAI,CACxE,CAAC,WAAW,EAAE,EAAE;gCACd,eAAe,CAAC,IAAI,GAAG,WAAW,CAAC;gCAEnC,OAAO,CAAC;oCACN,IAAI,EAAE,eAAe;oCACrB,EAAE,EAAE,cAAc,CAAC,MAAM;oCACzB,IAAI,EAAE,eAAe,CAAC,IAAI;oCAC1B,WAAW,EAAE,KAAK;iCACnB,CAAC,CAAC;4BACL,CAAC,EACD,GAAG,EAAE;gCACH,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gCAC5E,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,IAAI,CACtE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAClE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;4BACJ,CAAC,CACF,CAAC;yBACH;oBACH,CAAC,EACD,GAAG,EAAE;wBACH,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;wBAC5E,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,IAAI,CACtE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAClE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;oBACJ,CAAC,CACF,CAAC;iBACL;YACH,CAAC,EACD,GAAG,EAAE;gBACH,oBAAoB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5E,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,uBAAuB;YACvF,CAAC,CACF,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,QAA8B,EAC9B,kBAAuB,EACvB,yBAA6C;IAE7C,OAAO,IAAI,OAAO,CAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,kBAAkB,EAAE,UAAU,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,MAAM,WAAW,GAAG,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,WAAW,WAAW,6DAA6D,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAE5G,MAAM,MAAM,GAAG;gBACb,iBAAiB,EAAE;oBACjB,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW;oBACtC,QAAQ,EAAE,WAAW;oBACrB,IAAI,EAAE,UAAU;oBAChB,cAAc,EAAE;wBACd,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;wBAC1B,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU;wBACpC,KAAK,EAAE;4BACL;gCACE,IAAI,EAAE,UAAU;gCAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI;6BACzB;yBACF;qBACF;iBACF;aACF,CAAC;YAEF,MAAM,cAAc,GAAG;gBACrB,UAAU,EAAE,MAAM;gBAClB,cAAc,EAAE,yBAAyB;gBACzC,MAAM;gBACN,OAAO,EAAE;oBACP,QAAQ,EAAE,kBAAkB;oBAC5B,eAAe,EAAE,UAAU,yBAAyB,CAAC,KAAK,EAAE;oBAC5D,cAAc,EAAE,kBAAkB;oBAClC,sBAAsB,EAAE,UAAU,yBAAyB,CAAC,KAAK,EAAE;iBACpE;aACiB,CAAC;YAErB,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,IAAI,CAC/B,CAAC,QAAQ,EAAE,EAAE;gBACX,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpB,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;gBACJ,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC,CACF,CAAC;SACH;aAAM;YACL,MAAM,EAAE,CAAC;SACV;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/solution-web-tool",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.6.0",
|
|
4
4
|
"description": "Manages the creation and deployment of web tool geoprocessing service item type for @esri/solution.js.",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -18,6 +18,12 @@
|
|
|
18
18
|
"dist/**"
|
|
19
19
|
],
|
|
20
20
|
"devDependencies": {
|
|
21
|
+
"@types/jasmine": "^5.1.4",
|
|
22
|
+
"jasmine": "^5.2.0",
|
|
23
|
+
"jasmine-core": "^5.2.0",
|
|
24
|
+
"npm-check-updates": "^16.14.20"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
21
27
|
"@esri/arcgis-rest-auth": "^3.7.0",
|
|
22
28
|
"@esri/arcgis-rest-feature-layer": "^3.7.0",
|
|
23
29
|
"@esri/arcgis-rest-portal": "^3.7.0",
|
|
@@ -27,15 +33,8 @@
|
|
|
27
33
|
"@esri/hub-initiatives": "^14.0.0",
|
|
28
34
|
"@esri/hub-sites": "^15.0.0",
|
|
29
35
|
"@esri/hub-teams": "^14.1.1",
|
|
30
|
-
"@esri/solution-common": "^5.
|
|
31
|
-
"@esri/solution-simple-types": "^5.
|
|
32
|
-
"@types/jasmine": "^5.1.4",
|
|
33
|
-
"fetch-mock": "^7.7.3",
|
|
34
|
-
"jasmine": "^5.1.0",
|
|
35
|
-
"jasmine-core": "^5.1.2",
|
|
36
|
-
"npm-check-updates": "^16.14.20"
|
|
37
|
-
},
|
|
38
|
-
"dependencies": {
|
|
36
|
+
"@esri/solution-common": "^5.6.0",
|
|
37
|
+
"@esri/solution-simple-types": "^5.6.0",
|
|
39
38
|
"tslib": "1.14.1"
|
|
40
39
|
},
|
|
41
40
|
"scripts": {
|
|
@@ -82,5 +81,5 @@
|
|
|
82
81
|
"esri",
|
|
83
82
|
"ES6"
|
|
84
83
|
],
|
|
85
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "c6d0e558d919035883389ee28e15ea6e2fc07201"
|
|
86
85
|
}
|