@esri/solution-workflow 5.2.10 → 5.2.12
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/cjs/workflow.d.ts +2 -2
- package/dist/cjs/workflow.js +5 -5
- package/dist/cjs/workflow.js.map +1 -1
- package/dist/cjs/workflowHelpers.d.ts +3 -1
- package/dist/cjs/workflowHelpers.js +7 -6
- package/dist/cjs/workflowHelpers.js.map +1 -1
- package/dist/esm/workflow.d.ts +2 -2
- package/dist/esm/workflow.js +5 -5
- package/dist/esm/workflow.js.map +1 -1
- package/dist/esm/workflowHelpers.d.ts +3 -1
- package/dist/esm/workflowHelpers.js +7 -6
- package/dist/esm/workflowHelpers.js.map +1 -1
- package/package.json +3 -3
package/dist/cjs/workflow.d.ts
CHANGED
|
@@ -25,10 +25,10 @@ import * as common from "@esri/solution-common";
|
|
|
25
25
|
* @param itemInfo Info about the item
|
|
26
26
|
* @param destAuthentication Credentials for requests to the destination organization
|
|
27
27
|
* @param srcAuthentication Credentials for requests to source items
|
|
28
|
-
* @param
|
|
28
|
+
* @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
|
|
29
29
|
* @returns A promise that will resolve when the template has been created
|
|
30
30
|
*/
|
|
31
|
-
export declare function convertItemToTemplate(itemInfo: any, destAuthentication: common.UserSession, srcAuthentication: common.UserSession): Promise<common.IItemTemplate>;
|
|
31
|
+
export declare function convertItemToTemplate(itemInfo: any, destAuthentication: common.UserSession, srcAuthentication: common.UserSession, templateDictionary: any): Promise<common.IItemTemplate>;
|
|
32
32
|
/**
|
|
33
33
|
* Converts a workflow template into a new item.
|
|
34
34
|
*
|
package/dist/cjs/workflow.js
CHANGED
|
@@ -31,10 +31,10 @@ const workflowHelpers = tslib_1.__importStar(require("./workflowHelpers"));
|
|
|
31
31
|
* @param itemInfo Info about the item
|
|
32
32
|
* @param destAuthentication Credentials for requests to the destination organization
|
|
33
33
|
* @param srcAuthentication Credentials for requests to source items
|
|
34
|
-
* @param
|
|
34
|
+
* @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
|
|
35
35
|
* @returns A promise that will resolve when the template has been created
|
|
36
36
|
*/
|
|
37
|
-
async function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication) {
|
|
37
|
+
async function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication, templateDictionary) {
|
|
38
38
|
// Init template
|
|
39
39
|
const itemTemplate = common.createInitializedItemTemplate(itemInfo);
|
|
40
40
|
// Templatize item info property values
|
|
@@ -42,7 +42,7 @@ async function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentica
|
|
|
42
42
|
// Request related items
|
|
43
43
|
const relatedPromise = common.getItemRelatedItemsInSameDirection(itemTemplate.itemId, "forward", srcAuthentication);
|
|
44
44
|
// Request its configuration
|
|
45
|
-
const configPromise = common.getWorkflowConfigurationZip(itemInfo.id, srcAuthentication);
|
|
45
|
+
const configPromise = common.getWorkflowConfigurationZip(itemInfo.id, srcAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
46
46
|
const [relatedItems, configZip] = await Promise.all([relatedPromise, configPromise]);
|
|
47
47
|
// Save the mappings to related items & add those items to the dependencies, but not WMA Code Attachments
|
|
48
48
|
itemTemplate.dependencies = [];
|
|
@@ -87,7 +87,7 @@ async function createItemFromTemplate(template, templateDictionary, destinationA
|
|
|
87
87
|
newItemTemplate.item.thumbnail = template.item.thumbnail;
|
|
88
88
|
}
|
|
89
89
|
try {
|
|
90
|
-
const createdWorkflowItemId = await workflowHelpers.addWorkflowItem(newItemTemplate, destinationAuthentication);
|
|
90
|
+
const createdWorkflowItemId = await workflowHelpers.addWorkflowItem(newItemTemplate, destinationAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
91
91
|
if (!createdWorkflowItemId) {
|
|
92
92
|
throw new Error("Failed to create workflow item");
|
|
93
93
|
}
|
|
@@ -106,7 +106,7 @@ async function createItemFromTemplate(template, templateDictionary, destinationA
|
|
|
106
106
|
newItemTemplate.properties.configuration = common.replaceInTemplate(newItemTemplate.properties.configuration, templateDictionary);
|
|
107
107
|
// Add the item's configuration properties; throw if the configuration update fails
|
|
108
108
|
const configZipFile = await common.compressWorkflowIntoZipFile(newItemTemplate.properties.configuration);
|
|
109
|
-
await common.setWorkflowConfigurationZip(configZipFile, createdWorkflowItemId, destinationAuthentication);
|
|
109
|
+
await common.setWorkflowConfigurationZip(configZipFile, createdWorkflowItemId, destinationAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
110
110
|
// Fetch the auxiliary items
|
|
111
111
|
const itemIds = await workflowHelpers.fetchAuxiliaryItems(createdWorkflowItemId, destinationAuthentication);
|
|
112
112
|
// Move the workflow and auxiliary items to the destination
|
package/dist/cjs/workflow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/workflow.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH;;;;GAIG;AAEH,sEAAgD;AAChD,2EAAqD;AAErD,wHAAwH;AAExH;;;;;;;;GAQG;AACI,KAAK,UAAU,qBAAqB,CACzC,QAAa,EACb,kBAAsC,EACtC,iBAAqC;
|
|
1
|
+
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,10 +24,12 @@ import * as common from "@esri/solution-common";
|
|
|
24
24
|
*
|
|
25
25
|
* @param item Item to add
|
|
26
26
|
* @param authentication Credentials for requests to the workflow manager
|
|
27
|
+
* @param orgId Id of organization whose license is to be checked; only used if `enterpriseWebAdaptorUrl` is falsy
|
|
28
|
+
* @param server URL of the server, e.g., "https://gisserver.domain.com/server"
|
|
27
29
|
* @returns Promise resolving with new item's AGO id
|
|
28
30
|
* @throws {WorkflowJsonExceptionDTO} if request to workflow manager fails
|
|
29
31
|
*/
|
|
30
|
-
export declare function addWorkflowItem(item: common.IItemTemplate, authentication: common.UserSession): Promise<string>;
|
|
32
|
+
export declare function addWorkflowItem(item: common.IItemTemplate, authentication: common.UserSession, orgId: string | undefined, server?: string): Promise<string>;
|
|
31
33
|
/**
|
|
32
34
|
* Fetches the auxiliary items.
|
|
33
35
|
*
|
|
@@ -30,27 +30,28 @@ const restRequest = tslib_1.__importStar(require("@esri/arcgis-rest-request"));
|
|
|
30
30
|
*
|
|
31
31
|
* @param item Item to add
|
|
32
32
|
* @param authentication Credentials for requests to the workflow manager
|
|
33
|
+
* @param orgId Id of organization whose license is to be checked; only used if `enterpriseWebAdaptorUrl` is falsy
|
|
34
|
+
* @param server URL of the server, e.g., "https://gisserver.domain.com/server"
|
|
33
35
|
* @returns Promise resolving with new item's AGO id
|
|
34
36
|
* @throws {WorkflowJsonExceptionDTO} if request to workflow manager fails
|
|
35
37
|
*/
|
|
36
|
-
async function addWorkflowItem(item, authentication) {
|
|
37
|
-
const user = await authentication.getUser({ authentication });
|
|
38
|
+
async function addWorkflowItem(item, authentication, orgId, server) {
|
|
38
39
|
// Add the workflow item
|
|
39
|
-
const
|
|
40
|
-
const
|
|
40
|
+
const workflowUrlRoot = common.getWorkflowManagerUrlRoot(orgId, server);
|
|
41
|
+
const url = `${workflowUrlRoot}/admin/createWorkflowItem?name=${item.item.title}`;
|
|
42
|
+
const options = {
|
|
41
43
|
authentication: authentication,
|
|
42
44
|
headers: {
|
|
43
45
|
Accept: "application/json",
|
|
44
46
|
Authorization: `Bearer ${authentication.token}`,
|
|
45
47
|
"Content-Type": "application/json",
|
|
46
|
-
Host: "workflow.arcgis.com",
|
|
47
48
|
"X-Esri-Authorization": `Bearer ${authentication.token}`
|
|
48
49
|
},
|
|
49
50
|
params: {
|
|
50
51
|
name: `${item.item.title}`
|
|
51
52
|
}
|
|
52
53
|
};
|
|
53
|
-
const createdWorkflowResponse = await restRequest.request(
|
|
54
|
+
const createdWorkflowResponse = await restRequest.request(url, options);
|
|
54
55
|
return Promise.resolve(createdWorkflowResponse.itemId);
|
|
55
56
|
}
|
|
56
57
|
exports.addWorkflowItem = addWorkflowItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowHelpers.js","sourceRoot":"","sources":["../../src/workflowHelpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH;;;;GAIG;AAEH,sEAAgD;AAChD,+EAAyD;AAEzD,wHAAwH;AAExH
|
|
1
|
+
{"version":3,"file":"workflowHelpers.js","sourceRoot":"","sources":["../../src/workflowHelpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH;;;;GAIG;AAEH,sEAAgD;AAChD,+EAAyD;AAEzD,wHAAwH;AAExH;;;;;;;;;GASG;AACI,KAAK,UAAU,eAAe,CACnC,IAA0B,EAC1B,cAAkC,EAClC,KAAyB,EACzB,MAAe;IAEf,wBAAwB;IACxB,MAAM,eAAe,GAAG,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,GAAG,GAAG,GAAG,eAAe,kCAAkC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAElF,MAAM,OAAO,GAAgC;QAC3C,cAAc,EAAE,cAAc;QAC9B,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,UAAU,cAAc,CAAC,KAAK,EAAE;YAC/C,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,UAAU,cAAc,CAAC,KAAK,EAAE;SACzD;QACD,MAAM,EAAE;YACN,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;SAC3B;KACF,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAExE,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC;AAzBD,0CAyBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,mBAAmB,CACvC,cAAsB,EACtB,cAAkC;IAElC,MAAM,gBAAgB,GAAG,YAAY,cAAc,EAAE,CAAC;IACtD,MAAM,yBAAyB,GAAG,qBAAqB,cAAc,EAAE,CAAC;IACxE,MAAM,qBAAqB,GAAG,kBAAkB,cAAc,EAAE,CAAC;IAEjE,MAAM,qBAAqB,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;QACrD,CAAC,EAAE,SAAS,gBAAgB,aAAa,yBAAyB,aAAa,qBAAqB,EAAE;QACtG,cAAc,EAAE,cAAc;KAC/B,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7E,CAAC;AAbD,kDAaC"}
|
package/dist/esm/workflow.d.ts
CHANGED
|
@@ -25,10 +25,10 @@ import * as common from "@esri/solution-common";
|
|
|
25
25
|
* @param itemInfo Info about the item
|
|
26
26
|
* @param destAuthentication Credentials for requests to the destination organization
|
|
27
27
|
* @param srcAuthentication Credentials for requests to source items
|
|
28
|
-
* @param
|
|
28
|
+
* @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
|
|
29
29
|
* @returns A promise that will resolve when the template has been created
|
|
30
30
|
*/
|
|
31
|
-
export declare function convertItemToTemplate(itemInfo: any, destAuthentication: common.UserSession, srcAuthentication: common.UserSession): Promise<common.IItemTemplate>;
|
|
31
|
+
export declare function convertItemToTemplate(itemInfo: any, destAuthentication: common.UserSession, srcAuthentication: common.UserSession, templateDictionary: any): Promise<common.IItemTemplate>;
|
|
32
32
|
/**
|
|
33
33
|
* Converts a workflow template into a new item.
|
|
34
34
|
*
|
package/dist/esm/workflow.js
CHANGED
|
@@ -27,10 +27,10 @@ import * as workflowHelpers from "./workflowHelpers";
|
|
|
27
27
|
* @param itemInfo Info about the item
|
|
28
28
|
* @param destAuthentication Credentials for requests to the destination organization
|
|
29
29
|
* @param srcAuthentication Credentials for requests to source items
|
|
30
|
-
* @param
|
|
30
|
+
* @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
|
|
31
31
|
* @returns A promise that will resolve when the template has been created
|
|
32
32
|
*/
|
|
33
|
-
export async function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication) {
|
|
33
|
+
export async function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication, templateDictionary) {
|
|
34
34
|
// Init template
|
|
35
35
|
const itemTemplate = common.createInitializedItemTemplate(itemInfo);
|
|
36
36
|
// Templatize item info property values
|
|
@@ -38,7 +38,7 @@ export async function convertItemToTemplate(itemInfo, destAuthentication, srcAut
|
|
|
38
38
|
// Request related items
|
|
39
39
|
const relatedPromise = common.getItemRelatedItemsInSameDirection(itemTemplate.itemId, "forward", srcAuthentication);
|
|
40
40
|
// Request its configuration
|
|
41
|
-
const configPromise = common.getWorkflowConfigurationZip(itemInfo.id, srcAuthentication);
|
|
41
|
+
const configPromise = common.getWorkflowConfigurationZip(itemInfo.id, srcAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
42
42
|
const [relatedItems, configZip] = await Promise.all([relatedPromise, configPromise]);
|
|
43
43
|
// Save the mappings to related items & add those items to the dependencies, but not WMA Code Attachments
|
|
44
44
|
itemTemplate.dependencies = [];
|
|
@@ -82,7 +82,7 @@ export async function createItemFromTemplate(template, templateDictionary, desti
|
|
|
82
82
|
newItemTemplate.item.thumbnail = template.item.thumbnail;
|
|
83
83
|
}
|
|
84
84
|
try {
|
|
85
|
-
const createdWorkflowItemId = await workflowHelpers.addWorkflowItem(newItemTemplate, destinationAuthentication);
|
|
85
|
+
const createdWorkflowItemId = await workflowHelpers.addWorkflowItem(newItemTemplate, destinationAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
86
86
|
if (!createdWorkflowItemId) {
|
|
87
87
|
throw new Error("Failed to create workflow item");
|
|
88
88
|
}
|
|
@@ -101,7 +101,7 @@ export async function createItemFromTemplate(template, templateDictionary, desti
|
|
|
101
101
|
newItemTemplate.properties.configuration = common.replaceInTemplate(newItemTemplate.properties.configuration, templateDictionary);
|
|
102
102
|
// Add the item's configuration properties; throw if the configuration update fails
|
|
103
103
|
const configZipFile = await common.compressWorkflowIntoZipFile(newItemTemplate.properties.configuration);
|
|
104
|
-
await common.setWorkflowConfigurationZip(configZipFile, createdWorkflowItemId, destinationAuthentication);
|
|
104
|
+
await common.setWorkflowConfigurationZip(configZipFile, createdWorkflowItemId, destinationAuthentication, templateDictionary.orgId, templateDictionary.server);
|
|
105
105
|
// Fetch the auxiliary items
|
|
106
106
|
const itemIds = await workflowHelpers.fetchAuxiliaryItems(createdWorkflowItemId, destinationAuthentication);
|
|
107
107
|
// Move the workflow and auxiliary items to the destination
|
package/dist/esm/workflow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/workflow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAa,EACb,kBAAsC,EACtC,iBAAqC;
|
|
1
|
+
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,10 +24,12 @@ import * as common from "@esri/solution-common";
|
|
|
24
24
|
*
|
|
25
25
|
* @param item Item to add
|
|
26
26
|
* @param authentication Credentials for requests to the workflow manager
|
|
27
|
+
* @param orgId Id of organization whose license is to be checked; only used if `enterpriseWebAdaptorUrl` is falsy
|
|
28
|
+
* @param server URL of the server, e.g., "https://gisserver.domain.com/server"
|
|
27
29
|
* @returns Promise resolving with new item's AGO id
|
|
28
30
|
* @throws {WorkflowJsonExceptionDTO} if request to workflow manager fails
|
|
29
31
|
*/
|
|
30
|
-
export declare function addWorkflowItem(item: common.IItemTemplate, authentication: common.UserSession): Promise<string>;
|
|
32
|
+
export declare function addWorkflowItem(item: common.IItemTemplate, authentication: common.UserSession, orgId: string | undefined, server?: string): Promise<string>;
|
|
31
33
|
/**
|
|
32
34
|
* Fetches the auxiliary items.
|
|
33
35
|
*
|
|
@@ -26,27 +26,28 @@ import * as restRequest from "@esri/arcgis-rest-request";
|
|
|
26
26
|
*
|
|
27
27
|
* @param item Item to add
|
|
28
28
|
* @param authentication Credentials for requests to the workflow manager
|
|
29
|
+
* @param orgId Id of organization whose license is to be checked; only used if `enterpriseWebAdaptorUrl` is falsy
|
|
30
|
+
* @param server URL of the server, e.g., "https://gisserver.domain.com/server"
|
|
29
31
|
* @returns Promise resolving with new item's AGO id
|
|
30
32
|
* @throws {WorkflowJsonExceptionDTO} if request to workflow manager fails
|
|
31
33
|
*/
|
|
32
|
-
export async function addWorkflowItem(item, authentication) {
|
|
33
|
-
const user = await authentication.getUser({ authentication });
|
|
34
|
+
export async function addWorkflowItem(item, authentication, orgId, server) {
|
|
34
35
|
// Add the workflow item
|
|
35
|
-
const
|
|
36
|
-
const
|
|
36
|
+
const workflowUrlRoot = common.getWorkflowManagerUrlRoot(orgId, server);
|
|
37
|
+
const url = `${workflowUrlRoot}/admin/createWorkflowItem?name=${item.item.title}`;
|
|
38
|
+
const options = {
|
|
37
39
|
authentication: authentication,
|
|
38
40
|
headers: {
|
|
39
41
|
Accept: "application/json",
|
|
40
42
|
Authorization: `Bearer ${authentication.token}`,
|
|
41
43
|
"Content-Type": "application/json",
|
|
42
|
-
Host: "workflow.arcgis.com",
|
|
43
44
|
"X-Esri-Authorization": `Bearer ${authentication.token}`
|
|
44
45
|
},
|
|
45
46
|
params: {
|
|
46
47
|
name: `${item.item.title}`
|
|
47
48
|
}
|
|
48
49
|
};
|
|
49
|
-
const createdWorkflowResponse = await restRequest.request(
|
|
50
|
+
const createdWorkflowResponse = await restRequest.request(url, options);
|
|
50
51
|
return Promise.resolve(createdWorkflowResponse.itemId);
|
|
51
52
|
}
|
|
52
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowHelpers.js","sourceRoot":"","sources":["../../src/workflowHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAC;AAEzD,wHAAwH;AAExH
|
|
1
|
+
{"version":3,"file":"workflowHelpers.js","sourceRoot":"","sources":["../../src/workflowHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAC;AAEzD,wHAAwH;AAExH;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAA0B,EAC1B,cAAkC,EAClC,KAAyB,EACzB,MAAe;IAEf,wBAAwB;IACxB,MAAM,eAAe,GAAG,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,GAAG,GAAG,GAAG,eAAe,kCAAkC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAElF,MAAM,OAAO,GAAgC;QAC3C,cAAc,EAAE,cAAc;QAC9B,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,UAAU,cAAc,CAAC,KAAK,EAAE;YAC/C,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,UAAU,cAAc,CAAC,KAAK,EAAE;SACzD;QACD,MAAM,EAAE;YACN,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;SAC3B;KACF,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAExE,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,cAAsB,EACtB,cAAkC;IAElC,MAAM,gBAAgB,GAAG,YAAY,cAAc,EAAE,CAAC;IACtD,MAAM,yBAAyB,GAAG,qBAAqB,cAAc,EAAE,CAAC;IACxE,MAAM,qBAAqB,GAAG,kBAAkB,cAAc,EAAE,CAAC;IAEjE,MAAM,qBAAqB,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;QACrD,CAAC,EAAE,SAAS,gBAAgB,aAAa,yBAAyB,aAAa,qBAAqB,EAAE;QACtG,cAAc,EAAE,cAAc;KAC/B,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7E,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/solution-workflow",
|
|
3
|
-
"version": "5.2.
|
|
3
|
+
"version": "5.2.12",
|
|
4
4
|
"description": "Manages the creation and deployment of Workflow item types for @esri/solution.js.",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
],
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@esri/arcgis-rest-auth": "^3.7.0",
|
|
22
|
-
"@esri/solution-common": "^5.2.
|
|
22
|
+
"@esri/solution-common": "^5.2.12",
|
|
23
23
|
"@types/jasmine": "^5.1.4",
|
|
24
24
|
"fetch-mock": "^7.7.3",
|
|
25
25
|
"jasmine": "^5.1.0",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"esri",
|
|
67
67
|
"ES6"
|
|
68
68
|
],
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "020aa48438e262d141caa5d3a97bb16200c71629"
|
|
70
70
|
}
|