@esri/solution-web-tool 5.6.3 → 5.6.5
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.
|
@@ -24,7 +24,6 @@ const tslib_1 = require("tslib");
|
|
|
24
24
|
*/
|
|
25
25
|
const common = tslib_1.__importStar(require("@esri/solution-common"));
|
|
26
26
|
const solution_simple_types_1 = require("@esri/solution-simple-types");
|
|
27
|
-
const arcgis_rest_request_1 = require("@esri/arcgis-rest-request");
|
|
28
27
|
/**
|
|
29
28
|
* Creates a template from a Web Tool Geoprocessing item
|
|
30
29
|
*
|
|
@@ -80,37 +79,52 @@ function createItemFromTemplate(template, templateDictionary, destinationAuthent
|
|
|
80
79
|
newItemTemplate.item.id = createResponse.itemId;
|
|
81
80
|
newItemTemplate.data = {};
|
|
82
81
|
delete newItemTemplate.item.thumbnail;
|
|
83
|
-
//
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
.
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
82
|
+
// get the GPServer url from the webtoolService.json resource
|
|
83
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
84
|
+
common.getItemResourcesFiles(createResponse.itemId, destinationAuthentication).then((resourcesResponse) => {
|
|
85
|
+
let webtoolServicePromise = Promise.resolve();
|
|
86
|
+
resourcesResponse.some((v) => {
|
|
87
|
+
if (v.name === "webtoolService.json") {
|
|
88
|
+
webtoolServicePromise = common.blobToJson(v);
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
93
|
+
webtoolServicePromise.then((webtoolServiceResponse) => {
|
|
94
|
+
templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
|
|
95
|
+
// Update the template again now that we have the new item id
|
|
96
|
+
newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
|
|
97
|
+
// Update the item with snippet, description, popupInfo, etc.
|
|
98
|
+
common
|
|
99
|
+
.updateItemExtended({
|
|
100
|
+
...newItemTemplate.item,
|
|
101
|
+
}, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
|
|
102
|
+
.then(() => {
|
|
103
|
+
// Interrupt process if progress callback returns `false`
|
|
104
|
+
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
105
|
+
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
106
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
// Update the template to match what we've stored in AGO
|
|
110
|
+
common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
|
|
111
|
+
newItemTemplate.item = updatedItem;
|
|
112
|
+
resolve({
|
|
113
|
+
item: newItemTemplate,
|
|
114
|
+
id: createResponse.itemId,
|
|
115
|
+
type: newItemTemplate.type,
|
|
116
|
+
postProcess: false,
|
|
117
|
+
});
|
|
118
|
+
}, () => {
|
|
119
|
+
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
120
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
121
|
+
});
|
|
122
|
+
}
|
|
106
123
|
}, () => {
|
|
107
124
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
108
125
|
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
109
126
|
});
|
|
110
|
-
}
|
|
111
|
-
}, () => {
|
|
112
|
-
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
113
|
-
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
127
|
+
});
|
|
114
128
|
});
|
|
115
129
|
}
|
|
116
130
|
}, () => {
|
|
@@ -140,6 +154,7 @@ function createWebTool(template, templateDictionary, destinationAuthentication)
|
|
|
140
154
|
provider: "notebooks",
|
|
141
155
|
type: "GPServer",
|
|
142
156
|
jsonProperties: {
|
|
157
|
+
timeoutInMinutes: template.data.timeoutInMinutes,
|
|
143
158
|
title: template.item.title,
|
|
144
159
|
notebookId: template.data.notebookId,
|
|
145
160
|
tasks: [
|
|
@@ -162,7 +177,7 @@ function createWebTool(template, templateDictionary, destinationAuthentication)
|
|
|
162
177
|
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
163
178
|
},
|
|
164
179
|
};
|
|
165
|
-
|
|
180
|
+
common.request(url, requestOptions).then((response) => {
|
|
166
181
|
resolve(response);
|
|
167
182
|
}, (e) => {
|
|
168
183
|
reject(e);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import * as common from "@esri/solution-common";
|
|
22
22
|
import { simpleTypes } from "@esri/solution-simple-types";
|
|
23
|
-
import { request } from "@esri/arcgis-rest-request";
|
|
24
23
|
/**
|
|
25
24
|
* Creates a template from a Web Tool Geoprocessing item
|
|
26
25
|
*
|
|
@@ -75,37 +74,52 @@ export function createItemFromTemplate(template, templateDictionary, destination
|
|
|
75
74
|
newItemTemplate.item.id = createResponse.itemId;
|
|
76
75
|
newItemTemplate.data = {};
|
|
77
76
|
delete newItemTemplate.item.thumbnail;
|
|
78
|
-
//
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
.
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
77
|
+
// get the GPServer url from the webtoolService.json resource
|
|
78
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
79
|
+
common.getItemResourcesFiles(createResponse.itemId, destinationAuthentication).then((resourcesResponse) => {
|
|
80
|
+
let webtoolServicePromise = Promise.resolve();
|
|
81
|
+
resourcesResponse.some((v) => {
|
|
82
|
+
if (v.name === "webtoolService.json") {
|
|
83
|
+
webtoolServicePromise = common.blobToJson(v);
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
88
|
+
webtoolServicePromise.then((webtoolServiceResponse) => {
|
|
89
|
+
templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
|
|
90
|
+
// Update the template again now that we have the new item id
|
|
91
|
+
newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
|
|
92
|
+
// Update the item with snippet, description, popupInfo, etc.
|
|
93
|
+
common
|
|
94
|
+
.updateItemExtended({
|
|
95
|
+
...newItemTemplate.item,
|
|
96
|
+
}, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
|
|
97
|
+
.then(() => {
|
|
98
|
+
// Interrupt process if progress callback returns `false`
|
|
99
|
+
if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
|
|
100
|
+
itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
|
|
101
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
// Update the template to match what we've stored in AGO
|
|
105
|
+
common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
|
|
106
|
+
newItemTemplate.item = updatedItem;
|
|
107
|
+
resolve({
|
|
108
|
+
item: newItemTemplate,
|
|
109
|
+
id: createResponse.itemId,
|
|
110
|
+
type: newItemTemplate.type,
|
|
111
|
+
postProcess: false,
|
|
112
|
+
});
|
|
113
|
+
}, () => {
|
|
114
|
+
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
115
|
+
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
116
|
+
});
|
|
117
|
+
}
|
|
101
118
|
}, () => {
|
|
102
119
|
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
103
120
|
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
104
121
|
});
|
|
105
|
-
}
|
|
106
|
-
}, () => {
|
|
107
|
-
itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
|
|
108
|
-
common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
|
|
122
|
+
});
|
|
109
123
|
});
|
|
110
124
|
}
|
|
111
125
|
}, () => {
|
|
@@ -134,6 +148,7 @@ export function createWebTool(template, templateDictionary, destinationAuthentic
|
|
|
134
148
|
provider: "notebooks",
|
|
135
149
|
type: "GPServer",
|
|
136
150
|
jsonProperties: {
|
|
151
|
+
timeoutInMinutes: template.data.timeoutInMinutes,
|
|
137
152
|
title: template.item.title,
|
|
138
153
|
notebookId: template.data.notebookId,
|
|
139
154
|
tasks: [
|
|
@@ -156,7 +171,7 @@ export function createWebTool(template, templateDictionary, destinationAuthentic
|
|
|
156
171
|
"X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
|
|
157
172
|
},
|
|
158
173
|
};
|
|
159
|
-
request(url, requestOptions).then((response) => {
|
|
174
|
+
common.request(url, requestOptions).then((response) => {
|
|
160
175
|
resolve(response);
|
|
161
176
|
}, (e) => {
|
|
162
177
|
reject(e);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/solution-web-tool",
|
|
3
|
-
"version": "5.6.
|
|
3
|
+
"version": "5.6.5",
|
|
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",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"@esri/arcgis-rest-auth": "^3.7.0",
|
|
25
25
|
"@esri/arcgis-rest-portal": "^3.7.0",
|
|
26
26
|
"@esri/arcgis-rest-request": "^3.7.0",
|
|
27
|
-
"@esri/solution-common": "^5.6.
|
|
28
|
-
"@esri/solution-simple-types": "^5.6.
|
|
27
|
+
"@esri/solution-common": "^5.6.5",
|
|
28
|
+
"@esri/solution-simple-types": "^5.6.5",
|
|
29
29
|
"tslib": "1.14.1"
|
|
30
30
|
},
|
|
31
31
|
"scripts": {
|
|
@@ -72,5 +72,5 @@
|
|
|
72
72
|
"esri",
|
|
73
73
|
"ES6"
|
|
74
74
|
],
|
|
75
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "34aa39cf4de1ae2642862f6407df802939807431"
|
|
76
76
|
}
|