@esri/solution-simple-types 5.2.7 → 5.2.9
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/helpers/convert-item-to-template.js +12 -2
- package/dist/cjs/helpers/convert-item-to-template.js.map +1 -1
- package/dist/cjs/helpers/formHelpers.d.ts +2 -3
- package/dist/cjs/helpers/formHelpers.js +5 -6
- package/dist/cjs/helpers/formHelpers.js.map +1 -1
- package/dist/esm/helpers/convert-item-to-template.js +12 -2
- package/dist/esm/helpers/convert-item-to-template.js.map +1 -1
- package/dist/esm/helpers/formHelpers.d.ts +2 -3
- package/dist/esm/helpers/formHelpers.js +5 -6
- package/dist/esm/helpers/formHelpers.js.map +1 -1
- package/package.json +9 -9
|
@@ -119,8 +119,18 @@ function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentication,
|
|
|
119
119
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises, no-async-promise-executor
|
|
120
120
|
async (resolve) => {
|
|
121
121
|
let zipObject = await common.blobToZipObject(itemDataResponse);
|
|
122
|
-
// Templatize the form's webhooks
|
|
123
|
-
|
|
122
|
+
// Templatize the form's webhooks
|
|
123
|
+
const portal = await srcAuthentication.getPortal();
|
|
124
|
+
let sourceOrgUrl;
|
|
125
|
+
if (portal.urlKey) {
|
|
126
|
+
sourceOrgUrl = `https://${portal.urlKey}.maps.arcgis.com`;
|
|
127
|
+
}
|
|
128
|
+
else if (portal.portalHostname) {
|
|
129
|
+
sourceOrgUrl = `https://${portal.portalHostname}`;
|
|
130
|
+
}
|
|
131
|
+
if (sourceOrgUrl) {
|
|
132
|
+
zipObject = await formHelpers.templatizeFormWebHooks(zipObject, sourceOrgUrl);
|
|
133
|
+
}
|
|
124
134
|
itemTemplate.item.name = _getFormDataFilename(itemTemplate.item.name, itemDataResponse.name, `${itemTemplate.itemId}.zip`);
|
|
125
135
|
const templatizedFormData = await common.zipObjectToZipFile(zipObject, itemTemplate.item.name);
|
|
126
136
|
// Add the data file to the template so that it can be uploaded with the other resources in the solution
|
|
@@ -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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"}
|
|
@@ -18,8 +18,7 @@ import JSZip from "jszip";
|
|
|
18
18
|
* Templatizes the URLs in webhooks in a form's zip object.
|
|
19
19
|
*
|
|
20
20
|
* @param zipObject Form zip object to templatize; it is modified in place
|
|
21
|
-
* @param
|
|
22
|
-
* to the same ArcGIS Enterprise Portal or ArcGIS Online Organization
|
|
21
|
+
* @param sourceOrgUrl URL of the source organization, e.g., "https://myorg.maps.arcgis.com"
|
|
23
22
|
* @returns Promise that resolves to the modified zip object
|
|
24
23
|
*/
|
|
25
|
-
export declare function templatizeFormWebHooks(zipObject: JSZip,
|
|
24
|
+
export declare function templatizeFormWebHooks(zipObject: JSZip, sourceOrgUrl: string): Promise<JSZip>;
|
|
@@ -23,11 +23,10 @@ const common = tslib_1.__importStar(require("@esri/solution-common"));
|
|
|
23
23
|
* Templatizes the URLs in webhooks in a form's zip object.
|
|
24
24
|
*
|
|
25
25
|
* @param zipObject Form zip object to templatize; it is modified in place
|
|
26
|
-
* @param
|
|
27
|
-
* to the same ArcGIS Enterprise Portal or ArcGIS Online Organization
|
|
26
|
+
* @param sourceOrgUrl URL of the source organization, e.g., "https://myorg.maps.arcgis.com"
|
|
28
27
|
* @returns Promise that resolves to the modified zip object
|
|
29
28
|
*/
|
|
30
|
-
async function templatizeFormWebHooks(zipObject,
|
|
29
|
+
async function templatizeFormWebHooks(zipObject, sourceOrgUrl) {
|
|
31
30
|
const webhooks = await common.getWebHooksFromZipObject(zipObject);
|
|
32
31
|
if (webhooks.length > 0) {
|
|
33
32
|
webhooks.forEach((webhook) => {
|
|
@@ -43,9 +42,9 @@ async function templatizeFormWebHooks(zipObject, isOrgItem) {
|
|
|
43
42
|
const orgId = partialPathParts[1];
|
|
44
43
|
url = url.replace(orgId, "{{user.orgId}}");
|
|
45
44
|
}
|
|
46
|
-
else
|
|
47
|
-
// Templatize server
|
|
48
|
-
url = url.replace(
|
|
45
|
+
else {
|
|
46
|
+
// Templatize server, but only if it matches the source org URL
|
|
47
|
+
url = url.replace(sourceOrgUrl, "{{portalBaseUrl}}");
|
|
49
48
|
}
|
|
50
49
|
webhook.url = url;
|
|
51
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formHelpers.js","sourceRoot":"","sources":["../../../src/helpers/formHelpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH,sEAAgD;AAGhD,wHAAwH;AAExH
|
|
1
|
+
{"version":3,"file":"formHelpers.js","sourceRoot":"","sources":["../../../src/helpers/formHelpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH,sEAAgD;AAGhD,wHAAwH;AAExH;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,SAAgB,EAChB,YAAoB;IAEpB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAClE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;YAChC,6BAA6B;YAC7B,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,cAAc,GAAG,6BAA6B,CAAC;YAErD,IAAI,MAAM,KAAK,cAAc,EAAE;gBAC7B,0BAA0B;gBAC1B,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBAClC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;aAE5C;iBAAM;gBACL,+DAA+D;gBAC/D,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;aACtD;YAED,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;KACtE;IAED,iCAAiC;IACjC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC;AAjCD,wDAiCC"}
|
|
@@ -115,8 +115,18 @@ export function convertItemToTemplate(itemInfo, destAuthentication, srcAuthentic
|
|
|
115
115
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises, no-async-promise-executor
|
|
116
116
|
async (resolve) => {
|
|
117
117
|
let zipObject = await common.blobToZipObject(itemDataResponse);
|
|
118
|
-
// Templatize the form's webhooks
|
|
119
|
-
|
|
118
|
+
// Templatize the form's webhooks
|
|
119
|
+
const portal = await srcAuthentication.getPortal();
|
|
120
|
+
let sourceOrgUrl;
|
|
121
|
+
if (portal.urlKey) {
|
|
122
|
+
sourceOrgUrl = `https://${portal.urlKey}.maps.arcgis.com`;
|
|
123
|
+
}
|
|
124
|
+
else if (portal.portalHostname) {
|
|
125
|
+
sourceOrgUrl = `https://${portal.portalHostname}`;
|
|
126
|
+
}
|
|
127
|
+
if (sourceOrgUrl) {
|
|
128
|
+
zipObject = await formHelpers.templatizeFormWebHooks(zipObject, sourceOrgUrl);
|
|
129
|
+
}
|
|
120
130
|
itemTemplate.item.name = _getFormDataFilename(itemTemplate.item.name, itemDataResponse.name, `${itemTemplate.itemId}.zip`);
|
|
121
131
|
const templatizedFormData = await common.zipObjectToZipFile(zipObject, itemTemplate.item.name);
|
|
122
132
|
// Add the data file to the template so that it can be uploaded with the other resources in the solution
|
|
@@ -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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"}
|
|
@@ -18,8 +18,7 @@ import JSZip from "jszip";
|
|
|
18
18
|
* Templatizes the URLs in webhooks in a form's zip object.
|
|
19
19
|
*
|
|
20
20
|
* @param zipObject Form zip object to templatize; it is modified in place
|
|
21
|
-
* @param
|
|
22
|
-
* to the same ArcGIS Enterprise Portal or ArcGIS Online Organization
|
|
21
|
+
* @param sourceOrgUrl URL of the source organization, e.g., "https://myorg.maps.arcgis.com"
|
|
23
22
|
* @returns Promise that resolves to the modified zip object
|
|
24
23
|
*/
|
|
25
|
-
export declare function templatizeFormWebHooks(zipObject: JSZip,
|
|
24
|
+
export declare function templatizeFormWebHooks(zipObject: JSZip, sourceOrgUrl: string): Promise<JSZip>;
|
|
@@ -19,11 +19,10 @@ import * as common from "@esri/solution-common";
|
|
|
19
19
|
* Templatizes the URLs in webhooks in a form's zip object.
|
|
20
20
|
*
|
|
21
21
|
* @param zipObject Form zip object to templatize; it is modified in place
|
|
22
|
-
* @param
|
|
23
|
-
* to the same ArcGIS Enterprise Portal or ArcGIS Online Organization
|
|
22
|
+
* @param sourceOrgUrl URL of the source organization, e.g., "https://myorg.maps.arcgis.com"
|
|
24
23
|
* @returns Promise that resolves to the modified zip object
|
|
25
24
|
*/
|
|
26
|
-
export async function templatizeFormWebHooks(zipObject,
|
|
25
|
+
export async function templatizeFormWebHooks(zipObject, sourceOrgUrl) {
|
|
27
26
|
const webhooks = await common.getWebHooksFromZipObject(zipObject);
|
|
28
27
|
if (webhooks.length > 0) {
|
|
29
28
|
webhooks.forEach((webhook) => {
|
|
@@ -39,9 +38,9 @@ export async function templatizeFormWebHooks(zipObject, isOrgItem) {
|
|
|
39
38
|
const orgId = partialPathParts[1];
|
|
40
39
|
url = url.replace(orgId, "{{user.orgId}}");
|
|
41
40
|
}
|
|
42
|
-
else
|
|
43
|
-
// Templatize server
|
|
44
|
-
url = url.replace(
|
|
41
|
+
else {
|
|
42
|
+
// Templatize server, but only if it matches the source org URL
|
|
43
|
+
url = url.replace(sourceOrgUrl, "{{portalBaseUrl}}");
|
|
45
44
|
}
|
|
46
45
|
webhook.url = url;
|
|
47
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formHelpers.js","sourceRoot":"","sources":["../../../src/helpers/formHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAGhD,wHAAwH;AAExH
|
|
1
|
+
{"version":3,"file":"formHelpers.js","sourceRoot":"","sources":["../../../src/helpers/formHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAGhD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,SAAgB,EAChB,YAAoB;IAEpB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAClE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;YAChC,6BAA6B;YAC7B,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,cAAc,GAAG,6BAA6B,CAAC;YAErD,IAAI,MAAM,KAAK,cAAc,EAAE;gBAC7B,0BAA0B;gBAC1B,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBAClC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;aAE5C;iBAAM;gBACL,+DAA+D;gBAC/D,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;aACtD;YAED,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;KACtE;IAED,iCAAiC;IACjC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/solution-simple-types",
|
|
3
|
-
"version": "5.2.
|
|
3
|
+
"version": "5.2.9",
|
|
4
4
|
"description": "Manages the creation and deployment of simple item types for @esri/solution.js.",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -23,18 +23,18 @@
|
|
|
23
23
|
"@esri/arcgis-rest-portal": "^3.7.0",
|
|
24
24
|
"@esri/arcgis-rest-request": "^3.7.0",
|
|
25
25
|
"@esri/arcgis-rest-service-admin": "^3.7.0",
|
|
26
|
-
"@esri/hub-common": "^14.
|
|
27
|
-
"@esri/hub-sites": "^14.2.
|
|
26
|
+
"@esri/hub-common": "^14.106.0",
|
|
27
|
+
"@esri/hub-sites": "^14.2.3",
|
|
28
28
|
"@esri/hub-teams": "^14.1.0",
|
|
29
|
-
"@esri/solution-common": "^5.2.
|
|
30
|
-
"@esri/solution-feature-layer": "^5.2.
|
|
31
|
-
"@esri/solution-file": "^5.2.
|
|
32
|
-
"@esri/solution-group": "^5.2.
|
|
29
|
+
"@esri/solution-common": "^5.2.9",
|
|
30
|
+
"@esri/solution-feature-layer": "^5.2.9",
|
|
31
|
+
"@esri/solution-file": "^5.2.9",
|
|
32
|
+
"@esri/solution-group": "^5.2.9",
|
|
33
33
|
"@types/jasmine": "^5.1.4",
|
|
34
34
|
"fetch-mock": "^7.7.3",
|
|
35
35
|
"jasmine": "^5.1.0",
|
|
36
36
|
"jasmine-core": "^5.1.0",
|
|
37
|
-
"rollup": "^4.
|
|
37
|
+
"rollup": "^4.13.0"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"tslib": "1.14.1"
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
"esri",
|
|
91
91
|
"ES6"
|
|
92
92
|
],
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "bc37cab732ed83b30f5a160915c5f3ed2aaa438e"
|
|
94
94
|
}
|