@esri/solution-common 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.
- package/dist/cjs/completeItem.js +2 -2
- package/dist/cjs/completeItem.js.map +1 -1
- package/dist/cjs/create-hub-request-options.js +1 -1
- package/dist/cjs/deleteHelpers/deleteEmptyGroups.js +1 -1
- package/dist/cjs/deleteHelpers/deleteEmptyGroups.js.map +1 -1
- package/dist/cjs/deleteHelpers/deleteGroupIfEmpty.js +6 -6
- package/dist/cjs/deleteHelpers/deleteGroupIfEmpty.js.map +1 -1
- package/dist/cjs/deleteHelpers/deleteSolutionContents.js +7 -11
- package/dist/cjs/deleteHelpers/deleteSolutionContents.js.map +1 -1
- package/dist/cjs/deleteHelpers/deleteSolutionFolder.js +6 -6
- package/dist/cjs/deleteHelpers/deleteSolutionFolder.js.map +1 -1
- package/dist/cjs/deleteHelpers/deleteSolutionItem.js +4 -4
- package/dist/cjs/deleteHelpers/deleteSolutionItem.js.map +1 -1
- package/dist/cjs/deleteHelpers/reconstructBuildOrderIds.js.map +1 -1
- package/dist/cjs/deleteHelpers/removeItems.js +5 -6
- package/dist/cjs/deleteHelpers/removeItems.js.map +1 -1
- package/dist/cjs/deleteHelpers/reportProgress.js +1 -1
- package/dist/cjs/deleteHelpers/reportProgress.js.map +1 -1
- package/dist/cjs/deleteSolution.js +7 -7
- package/dist/cjs/deleteSolution.js.map +1 -1
- package/dist/cjs/dependencies.js +5 -5
- package/dist/cjs/dependencies.js.map +1 -1
- package/dist/cjs/featureServiceHelpers.js +132 -165
- package/dist/cjs/featureServiceHelpers.js.map +1 -1
- package/dist/cjs/formHelpers.js +1 -1
- package/dist/cjs/formHelpers.js.map +1 -1
- package/dist/cjs/generalHelpers.js +25 -40
- package/dist/cjs/generalHelpers.js.map +1 -1
- package/dist/cjs/get-subscription-info.js +1 -1
- package/dist/cjs/get-subscription-info.js.map +1 -1
- package/dist/cjs/getDeletableSolutionInfo.js.map +1 -1
- package/dist/cjs/getItemTypeAbbrev.js +27 -27
- package/dist/cjs/getItemTypeAbbrev.js.map +1 -1
- package/dist/cjs/getSolutionSummary.js +50 -51
- package/dist/cjs/getSolutionSummary.js.map +1 -1
- package/dist/cjs/interfaces.d.ts +2 -2
- package/dist/cjs/interfaces.js +1 -1
- package/dist/cjs/interfaces.js.map +1 -1
- package/dist/cjs/item-reuse.js +27 -24
- package/dist/cjs/item-reuse.js.map +1 -1
- package/dist/cjs/libConnectors.js +1 -1
- package/dist/cjs/libConnectors.js.map +1 -1
- package/dist/cjs/migrations/apply-schema.js +1 -1
- package/dist/cjs/migrations/is-legacy-solution.js +1 -2
- package/dist/cjs/migrations/is-legacy-solution.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-five.js +2 -2
- package/dist/cjs/migrations/upgrade-two-dot-five.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-four.js +4 -4
- package/dist/cjs/migrations/upgrade-two-dot-four.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-seven.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-six.js +2 -2
- package/dist/cjs/migrations/upgrade-two-dot-six.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-three.js +3 -3
- package/dist/cjs/migrations/upgrade-two-dot-three.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-two.js +3 -3
- package/dist/cjs/migrations/upgrade-two-dot-two.js.map +1 -1
- package/dist/cjs/migrations/upgrade-two-dot-zero.js +3 -3
- package/dist/cjs/migrations/upgrade-two-dot-zero.js.map +1 -1
- package/dist/cjs/migrator.js +1 -3
- package/dist/cjs/migrator.js.map +1 -1
- package/dist/cjs/resourceHelpers.js +24 -29
- package/dist/cjs/resourceHelpers.js.map +1 -1
- package/dist/cjs/resources/add-resource-from-blob.js +2 -2
- package/dist/cjs/resources/add-resource-from-blob.js.map +1 -1
- package/dist/cjs/resources/addMetadataFromBlob.js +3 -3
- package/dist/cjs/resources/addMetadataFromBlob.js.map +1 -1
- package/dist/cjs/resources/copyAssociatedFiles.js +25 -31
- package/dist/cjs/resources/copyAssociatedFiles.js.map +1 -1
- package/dist/cjs/resources/copyDataIntoItem.js +7 -9
- package/dist/cjs/resources/copyDataIntoItem.js.map +1 -1
- package/dist/cjs/resources/copyMetadataIntoItem.js +4 -6
- package/dist/cjs/resources/copyMetadataIntoItem.js.map +1 -1
- package/dist/cjs/resources/copyResourceIntoZip.js +3 -7
- package/dist/cjs/resources/copyResourceIntoZip.js.map +1 -1
- package/dist/cjs/resources/copyZipIntoItem.js +4 -5
- package/dist/cjs/resources/copyZipIntoItem.js.map +1 -1
- package/dist/cjs/resources/createCopyResults.js +1 -1
- package/dist/cjs/resources/get-blob.js +2 -2
- package/dist/cjs/resources/get-blob.js.map +1 -1
- package/dist/cjs/resources/getItemResourcesFilesFromPaths.js +5 -5
- package/dist/cjs/resources/getItemResourcesFilesFromPaths.js.map +1 -1
- package/dist/cjs/resources/getItemResourcesPaths.js +1 -1
- package/dist/cjs/resources/getItemResourcesPaths.js.map +1 -1
- package/dist/cjs/resources/transform-resource-paths-to-solution-resources.js +5 -11
- package/dist/cjs/resources/transform-resource-paths-to-solution-resources.js.map +1 -1
- package/dist/cjs/restHelpers.js +219 -261
- package/dist/cjs/restHelpers.js.map +1 -1
- package/dist/cjs/restHelpersGet.js +55 -63
- package/dist/cjs/restHelpersGet.js.map +1 -1
- package/dist/cjs/sharing/share-item-to-groups.js +2 -2
- package/dist/cjs/sharing/share-item-to-groups.js.map +1 -1
- package/dist/cjs/templatization.js +10 -12
- package/dist/cjs/templatization.js.map +1 -1
- package/dist/cjs/trackingHelpers.js +10 -15
- package/dist/cjs/trackingHelpers.js.map +1 -1
- package/dist/cjs/velocityHelpers.js +7 -11
- package/dist/cjs/velocityHelpers.js.map +1 -1
- package/dist/cjs/workflowHelpers.js +15 -17
- package/dist/cjs/workflowHelpers.js.map +1 -1
- package/dist/cjs/workforceHelpers.js +75 -103
- package/dist/cjs/workforceHelpers.js.map +1 -1
- package/dist/cjs/zip-utils.js +3 -3
- package/dist/cjs/zip-utils.js.map +1 -1
- package/dist/esm/completeItem.js +2 -2
- package/dist/esm/completeItem.js.map +1 -1
- package/dist/esm/create-hub-request-options.js +1 -1
- package/dist/esm/deleteHelpers/deleteEmptyGroups.js +1 -1
- package/dist/esm/deleteHelpers/deleteEmptyGroups.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteGroupIfEmpty.js +6 -6
- package/dist/esm/deleteHelpers/deleteGroupIfEmpty.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteSolutionContents.js +8 -12
- package/dist/esm/deleteHelpers/deleteSolutionContents.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteSolutionFolder.js +6 -6
- package/dist/esm/deleteHelpers/deleteSolutionFolder.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteSolutionItem.js +4 -4
- package/dist/esm/deleteHelpers/deleteSolutionItem.js.map +1 -1
- package/dist/esm/deleteHelpers/reconstructBuildOrderIds.js.map +1 -1
- package/dist/esm/deleteHelpers/removeItems.js +5 -6
- package/dist/esm/deleteHelpers/removeItems.js.map +1 -1
- package/dist/esm/deleteHelpers/reportProgress.js +1 -1
- package/dist/esm/deleteHelpers/reportProgress.js.map +1 -1
- package/dist/esm/deleteSolution.js +7 -7
- package/dist/esm/deleteSolution.js.map +1 -1
- package/dist/esm/dependencies.js +5 -5
- package/dist/esm/dependencies.js.map +1 -1
- package/dist/esm/featureServiceHelpers.js +134 -167
- package/dist/esm/featureServiceHelpers.js.map +1 -1
- package/dist/esm/formHelpers.js +1 -1
- package/dist/esm/formHelpers.js.map +1 -1
- package/dist/esm/generalHelpers.js +25 -40
- package/dist/esm/generalHelpers.js.map +1 -1
- package/dist/esm/get-subscription-info.js +1 -1
- package/dist/esm/get-subscription-info.js.map +1 -1
- package/dist/esm/getDeletableSolutionInfo.js.map +1 -1
- package/dist/esm/getItemTypeAbbrev.js +27 -27
- package/dist/esm/getItemTypeAbbrev.js.map +1 -1
- package/dist/esm/getSolutionSummary.js +51 -52
- package/dist/esm/getSolutionSummary.js.map +1 -1
- package/dist/esm/interfaces.d.ts +2 -2
- package/dist/esm/interfaces.js +2 -2
- package/dist/esm/interfaces.js.map +1 -1
- package/dist/esm/item-reuse.js +27 -24
- package/dist/esm/item-reuse.js.map +1 -1
- package/dist/esm/libConnectors.js +1 -1
- package/dist/esm/libConnectors.js.map +1 -1
- package/dist/esm/migrations/apply-schema.js +1 -1
- package/dist/esm/migrations/is-legacy-solution.js +1 -2
- package/dist/esm/migrations/is-legacy-solution.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-five.js +2 -2
- package/dist/esm/migrations/upgrade-two-dot-five.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-four.js +4 -4
- package/dist/esm/migrations/upgrade-two-dot-four.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-seven.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-six.js +2 -2
- package/dist/esm/migrations/upgrade-two-dot-six.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-three.js +3 -3
- package/dist/esm/migrations/upgrade-two-dot-three.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-two.js +3 -3
- package/dist/esm/migrations/upgrade-two-dot-two.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-zero.js +3 -3
- package/dist/esm/migrations/upgrade-two-dot-zero.js.map +1 -1
- package/dist/esm/migrator.js +1 -3
- package/dist/esm/migrator.js.map +1 -1
- package/dist/esm/resourceHelpers.js +26 -31
- package/dist/esm/resourceHelpers.js.map +1 -1
- package/dist/esm/resources/add-resource-from-blob.js +2 -2
- package/dist/esm/resources/add-resource-from-blob.js.map +1 -1
- package/dist/esm/resources/addMetadataFromBlob.js +3 -3
- package/dist/esm/resources/addMetadataFromBlob.js.map +1 -1
- package/dist/esm/resources/copyAssociatedFiles.js +26 -32
- package/dist/esm/resources/copyAssociatedFiles.js.map +1 -1
- package/dist/esm/resources/copyDataIntoItem.js +7 -9
- package/dist/esm/resources/copyDataIntoItem.js.map +1 -1
- package/dist/esm/resources/copyMetadataIntoItem.js +4 -6
- package/dist/esm/resources/copyMetadataIntoItem.js.map +1 -1
- package/dist/esm/resources/copyResourceIntoZip.js +3 -7
- package/dist/esm/resources/copyResourceIntoZip.js.map +1 -1
- package/dist/esm/resources/copyZipIntoItem.js +4 -5
- package/dist/esm/resources/copyZipIntoItem.js.map +1 -1
- package/dist/esm/resources/createCopyResults.js +1 -1
- package/dist/esm/resources/get-blob.js +2 -2
- package/dist/esm/resources/get-blob.js.map +1 -1
- package/dist/esm/resources/getItemResourcesFilesFromPaths.js +5 -5
- package/dist/esm/resources/getItemResourcesFilesFromPaths.js.map +1 -1
- package/dist/esm/resources/getItemResourcesPaths.js +1 -1
- package/dist/esm/resources/getItemResourcesPaths.js.map +1 -1
- package/dist/esm/resources/transform-resource-paths-to-solution-resources.js +5 -11
- package/dist/esm/resources/transform-resource-paths-to-solution-resources.js.map +1 -1
- package/dist/esm/restHelpers.js +224 -266
- package/dist/esm/restHelpers.js.map +1 -1
- package/dist/esm/restHelpersGet.js +56 -64
- package/dist/esm/restHelpersGet.js.map +1 -1
- package/dist/esm/sharing/share-item-to-groups.js +2 -2
- package/dist/esm/sharing/share-item-to-groups.js.map +1 -1
- package/dist/esm/templatization.js +10 -12
- package/dist/esm/templatization.js.map +1 -1
- package/dist/esm/trackingHelpers.js +10 -15
- package/dist/esm/trackingHelpers.js.map +1 -1
- package/dist/esm/velocityHelpers.js +7 -11
- package/dist/esm/velocityHelpers.js.map +1 -1
- package/dist/esm/workflowHelpers.js +15 -17
- package/dist/esm/workflowHelpers.js.map +1 -1
- package/dist/esm/workforceHelpers.js +75 -103
- package/dist/esm/workforceHelpers.js.map +1 -1
- package/dist/esm/zip-utils.js +3 -3
- package/dist/esm/zip-utils.js.map +1 -1
- package/dist/solution.js_commit.txt +6 -8
- package/package.json +13 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-two-dot-seven.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-seven.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,iDAAqD;AAErD;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAC,KAAU;IAC5C,IAAI,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IACD,oEAAoE;IACpE,mEAAmE;IACnE,oEAAoE;IACpE,qBAAqB;IACrB,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"upgrade-two-dot-seven.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-seven.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,iDAAqD;AAErD;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAC,KAAU;IAC5C,IAAI,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IACD,oEAAoE;IACpE,mEAAmE;IACnE,oEAAoE;IACpE,qBAAqB;IACrB,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,GAAW,EAAE,GAAU,EAAE,EAAE;QAClF,6DAA6D;QAC7D,wDAAwD;QACxD,0DAA0D;QAC1D,iDAAiD;QACjD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACb,CAAC,CAAC,MAAM,GAAG,IAAA,qBAAQ,GAAE,CAAC;SACvB;QACD,6DAA6D;QAC7D,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE;YACnB,CAAC,CAAC,YAAY,GAAG,EAAE,CAAC;SACrB;QACD,qDAAqD;QACrD,qBAAqB;QACrB,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1C,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SACxC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AA9BD,kDA8BC"}
|
|
@@ -41,7 +41,7 @@ function _upgradeTwoDotSix(model) {
|
|
|
41
41
|
question.maps.forEach((webMap) => {
|
|
42
42
|
const webMapId = (0, generalHelpers_1.cleanItemId)(webMap.itemId);
|
|
43
43
|
// remove the web map dependency from the form template
|
|
44
|
-
formTemplate.dependencies = formTemplate.dependencies.filter(dependency => dependency !== webMapId);
|
|
44
|
+
formTemplate.dependencies = formTemplate.dependencies.filter((dependency) => dependency !== webMapId);
|
|
45
45
|
// record the web map template id so we can remove them
|
|
46
46
|
mapIds.push(webMapId);
|
|
47
47
|
});
|
|
@@ -52,7 +52,7 @@ function _upgradeTwoDotSix(model) {
|
|
|
52
52
|
};
|
|
53
53
|
const webMapIds = formTemplates.reduce(toWebMapIds, []);
|
|
54
54
|
// remove the web map templates
|
|
55
|
-
clone.data.templates = clone.data.templates.filter(template => !webMapIds.includes(template.itemId));
|
|
55
|
+
clone.data.templates = clone.data.templates.filter((template) => !webMapIds.includes(template.itemId));
|
|
56
56
|
clone.item.properties.schemaVersion = 2.6;
|
|
57
57
|
return clone;
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-two-dot-six.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-six.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAAsE;AAEtE;;;;;;;;;GASG;AACH,SAAgB,iBAAiB,CAAC,KAAoB;IACpD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,MAAM,KAAK,GAAkB,IAAA,4BAAW,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"upgrade-two-dot-six.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-six.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAAsE;AAEtE;;;;;;;;;GASG;AACH,SAAgB,iBAAiB,CAAC,KAAoB;IACpD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,MAAM,KAAK,GAAkB,IAAA,4BAAW,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QAEjF,MAAM,WAAW,GAAG,CAAC,MAAgB,EAAE,YAA2B,EAAE,EAAE;YACpE,IAAI,IAAA,wBAAO,EAAC,YAAY,EAAE,kCAAkC,CAAC,EAAE;gBAC7D,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAa,EAAE,EAAE;oBAC/D,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACjB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;4BACpC,MAAM,QAAQ,GAAG,IAAA,4BAAW,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;4BAE5C,uDAAuD;4BACvD,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;4BAEtG,uDAAuD;4BACvD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACxB,CAAC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,SAAS,GAAa,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAElE,+BAA+B;QAC/B,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;QAE1C,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAlCD,8CAkCC"}
|
|
@@ -33,12 +33,12 @@ function _upgradeTwoDotThree(model) {
|
|
|
33
33
|
// this has landed in Hub, so we have actual items like this :(
|
|
34
34
|
// we will have another schema upgrade that will re-create the
|
|
35
35
|
// resources array
|
|
36
|
-
clone.data.templates = clone.data.templates.map(tmpl => {
|
|
36
|
+
clone.data.templates = clone.data.templates.map((tmpl) => {
|
|
37
37
|
if (tmpl.resources) {
|
|
38
|
-
tmpl.assets = tmpl.resources.map(r => {
|
|
38
|
+
tmpl.assets = tmpl.resources.map((r) => {
|
|
39
39
|
return {
|
|
40
40
|
name: r,
|
|
41
|
-
type: "resource"
|
|
41
|
+
type: "resource",
|
|
42
42
|
};
|
|
43
43
|
});
|
|
44
44
|
delete tmpl.resources;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-two-dot-three.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-three.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAA4C;AAC5C,iDAA+C;AAE/C;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,KAAoB;IACtD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IAEjC,+CAA+C;IAC/C,+DAA+D;IAC/D,8DAA8D;IAC9D,kBAAkB;IAClB,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"upgrade-two-dot-three.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-three.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAA4C;AAC5C,iDAA+C;AAE/C;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,KAAoB;IACtD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IAEjC,+CAA+C;IAC/C,+DAA+D;IAC/D,8DAA8D;IAC9D,kBAAkB;IAClB,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,OAAO;oBACL,IAAI,EAAE,CAAC;oBACP,IAAI,EAAE,UAAU;iBACjB,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;SAClB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AA3BD,kDA2BC"}
|
|
@@ -37,7 +37,7 @@ function _upgradeTwoDotTwo(model) {
|
|
|
37
37
|
{ src: "{{initiative.extent}}", val: "{{organization.defaultExtentBBox}}" },
|
|
38
38
|
{
|
|
39
39
|
src: "{{initiative.collaborationGroupId",
|
|
40
|
-
val: "{{teams.collaborationGroupId"
|
|
40
|
+
val: "{{teams.collaborationGroupId",
|
|
41
41
|
},
|
|
42
42
|
{ src: "{{initiative.openDataGroupId", val: "{{teams.contentGroupId" },
|
|
43
43
|
{ src: "{{initiative.contentGroupId", val: "{{teams.contentGroupId" },
|
|
@@ -46,9 +46,9 @@ function _upgradeTwoDotTwo(model) {
|
|
|
46
46
|
{ src: "{{contentGroupId", val: "{{teams.contentGroupId" },
|
|
47
47
|
{ src: "{{followersGroupId", val: "{{teams.followersGroupId" },
|
|
48
48
|
{ src: "{{initiative.id", val: "{{initiative.item.id" },
|
|
49
|
-
{ src: "{{organization.portalBaseUrl", val: "{{portalBaseUrl" }
|
|
49
|
+
{ src: "{{organization.portalBaseUrl", val: "{{portalBaseUrl" },
|
|
50
50
|
];
|
|
51
|
-
swaps.forEach(swap => {
|
|
51
|
+
swaps.forEach((swap) => {
|
|
52
52
|
clone.data = (0, hub_common_1.deepStringReplace)(clone.data, swap.src, swap.val);
|
|
53
53
|
});
|
|
54
54
|
clone.item.properties.schemaVersion = 2.2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-two-dot-two.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-two.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAA4C;AAC5C,iDAAkE;AAElE;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,KAAoB;IACpD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IACjC,mEAAmE;IACnE,MAAM,KAAK,GAAG;QACZ,EAAE,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACvD,EAAE,GAAG,EAAE,qBAAqB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,EAAE,GAAG,EAAE,sBAAsB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QAC1D,EAAE,GAAG,EAAE,uBAAuB,EAAE,GAAG,EAAE,oCAAoC,EAAE;QAC3E;YACE,GAAG,EAAE,mCAAmC;YACxC,GAAG,EAAE,8BAA8B;SACpC;QACD,EAAE,GAAG,EAAE,8BAA8B,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACtE,EAAE,GAAG,EAAE,6BAA6B,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACrE,EAAE,GAAG,EAAE,+BAA+B,EAAE,GAAG,EAAE,0BAA0B,EAAE;QACzE,EAAE,GAAG,EAAE,wBAAwB,EAAE,GAAG,EAAE,8BAA8B,EAAE;QACtE,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,wBAAwB,EAAE;QAC1D,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,EAAE,0BAA0B,EAAE;QAC9D,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,sBAAsB,EAAE;QACvD,EAAE,GAAG,EAAE,8BAA8B,EAAE,GAAG,EAAE,iBAAiB,EAAE;KAChE,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"upgrade-two-dot-two.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-two.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,sDAA4C;AAC5C,iDAAkE;AAElE;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,KAAoB;IACpD,IAAI,IAAA,wBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IACjC,mEAAmE;IACnE,MAAM,KAAK,GAAG;QACZ,EAAE,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACvD,EAAE,GAAG,EAAE,qBAAqB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,EAAE,GAAG,EAAE,sBAAsB,EAAE,GAAG,EAAE,oBAAoB,EAAE;QAC1D,EAAE,GAAG,EAAE,uBAAuB,EAAE,GAAG,EAAE,oCAAoC,EAAE;QAC3E;YACE,GAAG,EAAE,mCAAmC;YACxC,GAAG,EAAE,8BAA8B;SACpC;QACD,EAAE,GAAG,EAAE,8BAA8B,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACtE,EAAE,GAAG,EAAE,6BAA6B,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACrE,EAAE,GAAG,EAAE,+BAA+B,EAAE,GAAG,EAAE,0BAA0B,EAAE;QACzE,EAAE,GAAG,EAAE,wBAAwB,EAAE,GAAG,EAAE,8BAA8B,EAAE;QACtE,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,wBAAwB,EAAE;QAC1D,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,EAAE,0BAA0B,EAAE;QAC9D,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,sBAAsB,EAAE;QACvD,EAAE,GAAG,EAAE,8BAA8B,EAAE,GAAG,EAAE,iBAAiB,EAAE;KAChE,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,KAAK,CAAC,IAAI,GAAG,IAAA,8BAAiB,EAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAsB,CAAC;IACtF,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AA9BD,8CA8BC"}
|
|
@@ -71,8 +71,8 @@ const _convertIndicatorToDefinition = function (ind) {
|
|
|
71
71
|
description: ind.label || ind.fieldName,
|
|
72
72
|
supportedTypes: [].concat(ind.layerOptions.supportedTypes),
|
|
73
73
|
geometryTypes: [].concat(ind.layerOptions.geometryTypes),
|
|
74
|
-
fields: ind.fields.map(exports._convertIndicatorField)
|
|
75
|
-
}
|
|
74
|
+
fields: ind.fields.map(exports._convertIndicatorField),
|
|
75
|
+
},
|
|
76
76
|
};
|
|
77
77
|
return def;
|
|
78
78
|
};
|
|
@@ -88,7 +88,7 @@ const _convertIndicatorField = function (field) {
|
|
|
88
88
|
name: field.label,
|
|
89
89
|
optional: field.optional || false,
|
|
90
90
|
description: field.tooltip,
|
|
91
|
-
supportedTypes: [].concat(field.supportedTypes)
|
|
91
|
+
supportedTypes: [].concat(field.supportedTypes),
|
|
92
92
|
};
|
|
93
93
|
};
|
|
94
94
|
exports._convertIndicatorField = _convertIndicatorField;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-two-dot-zero.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-zero.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,iDAAwD;AAExD;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,KAAU;IAC3C,IAAI,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,CAAC,EAAE;QACxD,OAAO,KAAK,CAAC;KACd;IACD,wDAAwD;IACxD,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IACjC,MAAM,cAAc,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,4BAA4B,CAAC,IAAI,EAAE,CAAC;IAE1E,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"upgrade-two-dot-zero.js","sourceRoot":"","sources":["../../../src/migrations/upgrade-two-dot-zero.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,iDAAwD;AAExD;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,KAAU;IAC3C,IAAI,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,CAAC,EAAE;QACxD,OAAO,KAAK,CAAC;KACd;IACD,wDAAwD;IACxD,MAAM,KAAK,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;IACjC,MAAM,cAAc,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,4BAA4B,CAAC,IAAI,EAAE,CAAC;IAE1E,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC;IACpF,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,+BAA+B,CAAC,cAAc,CAAC,CAAC;IACxE,uBAAuB;IACvB,OAAO,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;IAExC,2BAA2B;IAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,gDAgBC;AAED;;;;;GAKG;AACH,SAAgB,+BAA+B,CAAC,iBAAsB,EAAE;IACtE,8FAA8F;IAC9F,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;QACnE,cAAc,CAAC,MAAM,GAAG,EAAE,CAAC;KAC5B;IACD,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,qCAA6B,CAAC,CAAC;IACtE,+DAA+D;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AARD,0EAQC;AAED;;;;GAIG;AACI,MAAM,6BAA6B,GAAG,UAAU,GAAQ;IAC7D,MAAM,GAAG,GAAG;QACV,EAAE,EAAE,GAAG,CAAC,SAAS;QACjB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,SAAS;QAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,KAAK;QAC/B,UAAU,EAAE;YACV,WAAW,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,SAAS;YACvC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC;YAC1D,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACxD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,8BAAsB,CAAC;SAC/C;KACF,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAdW,QAAA,6BAA6B,iCAcxC;AAEF;;;;GAIG;AACI,MAAM,sBAAsB,GAAG,UAAU,KAAU;IACxD,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,SAAS;QACnB,IAAI,EAAE,KAAK,CAAC,KAAK;QACjB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,WAAW,EAAE,KAAK,CAAC,OAAO;QAC1B,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,sBAAsB,0BAQjC"}
|
package/dist/cjs/migrator.js
CHANGED
|
@@ -63,9 +63,7 @@ function migrateSchema(model) {
|
|
|
63
63
|
// with the Solution.js deployer.
|
|
64
64
|
schemaUpgrades.push(apply_schema_1._applySchema, upgrade_two_dot_zero_1._upgradeTwoDotZero, upgrade_two_dot_one_1._upgradeTwoDotOne, upgrade_two_dot_two_1._upgradeTwoDotTwo, upgrade_two_dot_three_1._upgradeTwoDotThree, upgrade_two_dot_four_1._upgradeTwoDotFour, upgrade_two_dot_five_1._upgradeTwoDotFive, upgrade_two_dot_six_1._upgradeTwoDotSix, upgrade_two_dot_seven_1._upgradeTwoDotSeven);
|
|
65
65
|
// Apply the 3.x upgrades
|
|
66
|
-
schemaUpgrades.push(upgrade_three_dot_zero_1._upgradeThreeDotZero
|
|
67
|
-
// _upgradeThreeDotOne // Not ready for prod yet
|
|
68
|
-
);
|
|
66
|
+
schemaUpgrades.push(upgrade_three_dot_zero_1._upgradeThreeDotZero);
|
|
69
67
|
}
|
|
70
68
|
// Run any migrations serially. Since we start with a promise,
|
|
71
69
|
// individual migrations are free to return either ISolutionItem
|
package/dist/cjs/migrator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migrator.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,wEAAoE;AACpE,4DAAyD;AACzD,4EAAuE;AACvE,0EAAqE;AACrE,0EAAqE;AACrE,8EAAyE;AACzE,4EAAuE;AACvE,4EAAuE;AACvE,0EAAqE;AACrE,8EAAyE;AACzE,gFAA2E;AAI3E,iDAA2C;AAE3C,2EAA2E;AAC9D,QAAA,sBAAsB,GAAG,GAAG,CAAC;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,KAAoB;IAChD,oBAAoB;IACpB,IAAI,CAAC,IAAA,oBAAO,EAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE;QACtC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;KAC5B;IAED,MAAM,YAAY,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,CAAC;IACrE,oDAAoD;IACpD,IAAI,YAAY,KAAK,8BAAsB,EAAE;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B;SAAM;QACL,oDAAoD;QACpD,MAAM,QAAQ,GAAG,IAAA,sCAAiB,EAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,EAAE,CAAC;QAE1B,+DAA+D;QAC/D,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,EAAE;YAC9B,4BAA4B;YAC5B,qDAAqD;YACrD,cAAc,CAAC,IAAI,CAAC,6CAAoB,CAAC,CAAC;YAC1C,kEAAkE;SACnE;aAAM;YACL,mEAAmE;YACnE,iCAAiC;YACjC,cAAc,CAAC,IAAI,CACjB,2BAAY,EACZ,yCAAkB,EAClB,uCAAiB,EACjB,uCAAiB,EACjB,2CAAmB,EACnB,yCAAkB,EAClB,yCAAkB,EAClB,uCAAiB,EACjB,2CAAmB,CACpB,CAAC;YACF,yBAAyB;YACzB,cAAc,CAAC,IAAI,CACjB,6CAAoB
|
|
1
|
+
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migrator.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,wEAAoE;AACpE,4DAAyD;AACzD,4EAAuE;AACvE,0EAAqE;AACrE,0EAAqE;AACrE,8EAAyE;AACzE,4EAAuE;AACvE,4EAAuE;AACvE,0EAAqE;AACrE,8EAAyE;AACzE,gFAA2E;AAI3E,iDAA2C;AAE3C,2EAA2E;AAC9D,QAAA,sBAAsB,GAAG,GAAG,CAAC;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,KAAoB;IAChD,oBAAoB;IACpB,IAAI,CAAC,IAAA,oBAAO,EAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE;QACtC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;KAC5B;IAED,MAAM,YAAY,GAAG,IAAA,oBAAO,EAAC,KAAK,EAAE,+BAA+B,CAAC,CAAC;IACrE,oDAAoD;IACpD,IAAI,YAAY,KAAK,8BAAsB,EAAE;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B;SAAM;QACL,oDAAoD;QACpD,MAAM,QAAQ,GAAG,IAAA,sCAAiB,EAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,EAAE,CAAC;QAE1B,+DAA+D;QAC/D,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,EAAE;YAC9B,4BAA4B;YAC5B,qDAAqD;YACrD,cAAc,CAAC,IAAI,CAAC,6CAAoB,CAAC,CAAC;YAC1C,kEAAkE;SACnE;aAAM;YACL,mEAAmE;YACnE,iCAAiC;YACjC,cAAc,CAAC,IAAI,CACjB,2BAAY,EACZ,yCAAkB,EAClB,uCAAiB,EACjB,uCAAiB,EACjB,2CAAmB,EACnB,yCAAkB,EAClB,yCAAkB,EAClB,uCAAiB,EACjB,2CAAmB,CACpB,CAAC;YACF,yBAAyB;YACzB,cAAc,CAAC,IAAI,CACjB,6CAAoB,CAErB,CAAC;SACH;QACD,8DAA8D;QAC9D,gEAAgE;QAChE,4BAA4B;QAC5B,OAAO,cAAc,CAAC,MAAM,CAC1B,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAA2B,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAC9F,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CACvB,CAAC;KACH;AACH,CAAC;AAjDD,sCAiDC"}
|
|
@@ -60,12 +60,12 @@ function addThumbnailFromBlob(blob, itemId, authentication, isGroup = false) {
|
|
|
60
60
|
const updateOptions = {
|
|
61
61
|
params: {
|
|
62
62
|
// Pass image in directly because item object is serialized, which discards a blob
|
|
63
|
-
thumbnail: blob
|
|
63
|
+
thumbnail: blob,
|
|
64
64
|
},
|
|
65
|
-
authentication: authentication
|
|
65
|
+
authentication: authentication,
|
|
66
66
|
};
|
|
67
67
|
updateOptions[isGroup ? "group" : "item"] = {
|
|
68
|
-
id: itemId
|
|
68
|
+
id: itemId,
|
|
69
69
|
};
|
|
70
70
|
return isGroup ? (0, arcgis_rest_portal_1.updateGroup)(updateOptions) : (0, arcgis_rest_portal_1.updateItem)(updateOptions);
|
|
71
71
|
}
|
|
@@ -79,7 +79,7 @@ function convertBlobToSupportableResource(blob, filename = "") {
|
|
|
79
79
|
return {
|
|
80
80
|
blob: new File([blob], filenameToUse, { type: blob.type }),
|
|
81
81
|
filename: originalFilename,
|
|
82
|
-
mimeType: blob.type
|
|
82
|
+
mimeType: blob.type,
|
|
83
83
|
};
|
|
84
84
|
}
|
|
85
85
|
exports.convertBlobToSupportableResource = convertBlobToSupportableResource;
|
|
@@ -106,7 +106,7 @@ function copyFilesFromStorageItem(storageAuthentication, filePaths, sourceItemId
|
|
|
106
106
|
// remove the template.itemId from the fileName in the filePaths
|
|
107
107
|
/* istanbul ignore else */
|
|
108
108
|
if (template.itemId) {
|
|
109
|
-
filePaths = filePaths.map(fp => {
|
|
109
|
+
filePaths = filePaths.map((fp) => {
|
|
110
110
|
/* istanbul ignore else */
|
|
111
111
|
if (fp.filename.indexOf(template.itemId) === 0 && fp.folder === "") {
|
|
112
112
|
fp.filename = fp.filename.replace(`${template.itemId}-`, "");
|
|
@@ -115,13 +115,13 @@ function copyFilesFromStorageItem(storageAuthentication, filePaths, sourceItemId
|
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
return new Promise((resolve, reject) => {
|
|
118
|
-
const fileInfos = filePaths.map(path => {
|
|
118
|
+
const fileInfos = filePaths.map((path) => {
|
|
119
119
|
return {
|
|
120
120
|
folder: path.type === interfaces_1.EFileType.Data ? destinationFolderId : path.folder,
|
|
121
121
|
filename: path.filename,
|
|
122
122
|
type: path.type,
|
|
123
123
|
mimeType: mimeTypes ? mimeTypes[path.filename] : "",
|
|
124
|
-
url: path.url
|
|
124
|
+
url: path.url,
|
|
125
125
|
};
|
|
126
126
|
});
|
|
127
127
|
void (0, copyAssociatedFiles_1.copyAssociatedFilesByType)(fileInfos, storageAuthentication, sourceItemId, destinationItemId, destinationAuthentication, template, templateDictionary).then((results) => {
|
|
@@ -152,7 +152,7 @@ exports.copyFilesFromStorageItem = copyFilesFromStorageItem;
|
|
|
152
152
|
* @returns A promise which resolves to a list of the filenames under which the resource/metadata are stored
|
|
153
153
|
*/
|
|
154
154
|
function copyFilesToStorageItem(files, storageItemId, storageAuthentication) {
|
|
155
|
-
return new Promise(resolve => {
|
|
155
|
+
return new Promise((resolve) => {
|
|
156
156
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
157
157
|
void (0, copyAssociatedFiles_1.copyFilesAsResources)(files, storageItemId, storageAuthentication).then((results) => {
|
|
158
158
|
resolve(results
|
|
@@ -174,7 +174,7 @@ exports.copyFilesToStorageItem = copyFilesToStorageItem;
|
|
|
174
174
|
function generateMetadataStorageFilename(itemId) {
|
|
175
175
|
return {
|
|
176
176
|
folder: itemId + "_info_metadata",
|
|
177
|
-
filename: "metadata.xml"
|
|
177
|
+
filename: "metadata.xml",
|
|
178
178
|
};
|
|
179
179
|
}
|
|
180
180
|
exports.generateMetadataStorageFilename = generateMetadataStorageFilename;
|
|
@@ -191,17 +191,17 @@ exports.generateMetadataStorageFilename = generateMetadataStorageFilename;
|
|
|
191
191
|
* @returns List of item files' URLs and folder/filenames for storing the files
|
|
192
192
|
*/
|
|
193
193
|
function generateSourceFilePaths(portalSharingUrl, itemId, thumbnailUrlPart, resourceFilenames, isGroup = false, storageVersion = 0) {
|
|
194
|
-
const filePaths = resourceFilenames.map(resourceFilename => {
|
|
194
|
+
const filePaths = resourceFilenames.map((resourceFilename) => {
|
|
195
195
|
return {
|
|
196
196
|
itemId,
|
|
197
197
|
url: generateSourceResourceUrl(portalSharingUrl, itemId, resourceFilename),
|
|
198
|
-
...(0, convert_item_resource_to_storage_resource_1.convertItemResourceToStorageResource)(itemId, resourceFilename, storageVersion)
|
|
198
|
+
...(0, convert_item_resource_to_storage_resource_1.convertItemResourceToStorageResource)(itemId, resourceFilename, storageVersion),
|
|
199
199
|
};
|
|
200
200
|
});
|
|
201
201
|
filePaths.push({
|
|
202
202
|
itemId,
|
|
203
203
|
url: generateSourceMetadataUrl(portalSharingUrl, itemId, isGroup),
|
|
204
|
-
...generateMetadataStorageFilename(itemId)
|
|
204
|
+
...generateMetadataStorageFilename(itemId),
|
|
205
205
|
});
|
|
206
206
|
/* istanbul ignore else */
|
|
207
207
|
if (thumbnailUrlPart) {
|
|
@@ -223,7 +223,7 @@ function generateSourceThumbnailPath(portalSharingUrl, itemId, thumbnailUrlPart,
|
|
|
223
223
|
return {
|
|
224
224
|
itemId,
|
|
225
225
|
url: (0, generalHelpers_1.appendQueryParam)(generateSourceThumbnailUrl(portalSharingUrl, itemId, thumbnailUrlPart, isGroup), "w=400"),
|
|
226
|
-
...generateThumbnailStorageFilename(itemId, thumbnailUrlPart)
|
|
226
|
+
...generateThumbnailStorageFilename(itemId, thumbnailUrlPart),
|
|
227
227
|
};
|
|
228
228
|
}
|
|
229
229
|
exports.generateSourceThumbnailPath = generateSourceThumbnailPath;
|
|
@@ -251,11 +251,7 @@ exports.generateSourceMetadataUrl = generateSourceMetadataUrl;
|
|
|
251
251
|
* @returns URL string
|
|
252
252
|
*/
|
|
253
253
|
function generateSourceResourceUrl(sourcePortalSharingUrl, itemId, sourceResourceFilename) {
|
|
254
|
-
return ((0, generalHelpers_1.checkUrlPathTermination)(sourcePortalSharingUrl) +
|
|
255
|
-
"content/items/" +
|
|
256
|
-
itemId +
|
|
257
|
-
"/resources/" +
|
|
258
|
-
sourceResourceFilename);
|
|
254
|
+
return ((0, generalHelpers_1.checkUrlPathTermination)(sourcePortalSharingUrl) + "content/items/" + itemId + "/resources/" + sourceResourceFilename);
|
|
259
255
|
}
|
|
260
256
|
exports.generateSourceResourceUrl = generateSourceResourceUrl;
|
|
261
257
|
/**
|
|
@@ -286,10 +282,10 @@ exports.generateSourceThumbnailUrl = generateSourceThumbnailUrl;
|
|
|
286
282
|
* @returns List of item files' URLs and folder/filenames for storing the files
|
|
287
283
|
*/
|
|
288
284
|
function generateStorageFilePaths(portalSharingUrl, storageItemId, resourceFilenames = [], storageVersion = 0) {
|
|
289
|
-
return resourceFilenames.map(resourceFilename => {
|
|
285
|
+
return resourceFilenames.map((resourceFilename) => {
|
|
290
286
|
return {
|
|
291
287
|
url: generateSourceResourceUrl(portalSharingUrl, storageItemId, resourceFilename),
|
|
292
|
-
...(0, convert_storage_resource_to_item_resource_1.convertStorageResourceToItemResource)(resourceFilename, storageVersion)
|
|
288
|
+
...(0, convert_storage_resource_to_item_resource_1.convertStorageResourceToItemResource)(resourceFilename, storageVersion),
|
|
293
289
|
};
|
|
294
290
|
});
|
|
295
291
|
}
|
|
@@ -306,9 +302,7 @@ exports.generateStorageFilePaths = generateStorageFilePaths;
|
|
|
306
302
|
function generateThumbnailStorageFilename(itemId, thumbnailurl) {
|
|
307
303
|
const folder = itemId + "_info_thumbnail";
|
|
308
304
|
const thumbnailUrlParts = thumbnailurl.split("/");
|
|
309
|
-
const filename = thumbnailUrlParts.length === 1
|
|
310
|
-
? thumbnailUrlParts[0]
|
|
311
|
-
: thumbnailUrlParts[1];
|
|
305
|
+
const filename = thumbnailUrlParts.length === 1 ? thumbnailUrlParts[0] : thumbnailUrlParts[1];
|
|
312
306
|
return { folder, filename };
|
|
313
307
|
}
|
|
314
308
|
exports.generateThumbnailStorageFilename = generateThumbnailStorageFilename;
|
|
@@ -317,8 +311,7 @@ function isSupportedFileType(filename) {
|
|
|
317
311
|
// .svgz, .geodatabase (https://developers.arcgis.com/rest/users-groups-and-items/add-resources.htm)
|
|
318
312
|
const filenameExtension = filename.match(/\.([a-z]+)$/i);
|
|
319
313
|
const supportedExtensions = "|.json|.xml|.txt|.png|.pbf|.zip|.jpeg|.jpg|.gif|.bmp|.gz|.svg|.svgz|.geodatabase|";
|
|
320
|
-
return
|
|
321
|
-
supportedExtensions.indexOf("|" + filenameExtension[0] + "|") >= 0);
|
|
314
|
+
return !!filenameExtension && supportedExtensions.indexOf("|" + filenameExtension[0] + "|") >= 0;
|
|
322
315
|
}
|
|
323
316
|
exports.isSupportedFileType = isSupportedFileType;
|
|
324
317
|
/**
|
|
@@ -331,7 +324,7 @@ exports.isSupportedFileType = isSupportedFileType;
|
|
|
331
324
|
function getThumbnailFromStorageItem(authentication, filePaths) {
|
|
332
325
|
let thumbnailUrl;
|
|
333
326
|
let thumbnailFilename;
|
|
334
|
-
filePaths.forEach(path => {
|
|
327
|
+
filePaths.forEach((path) => {
|
|
335
328
|
if (path.type === interfaces_1.EFileType.Thumbnail) {
|
|
336
329
|
thumbnailUrl = path.url;
|
|
337
330
|
thumbnailFilename = path.filename;
|
|
@@ -355,7 +348,7 @@ function removeItemResourceFile(itemId, filename, authentication) {
|
|
|
355
348
|
return (0, arcgis_rest_portal_1.removeItemResource)({
|
|
356
349
|
id: itemId,
|
|
357
350
|
resource: filename,
|
|
358
|
-
authentication: authentication
|
|
351
|
+
authentication: authentication,
|
|
359
352
|
});
|
|
360
353
|
}
|
|
361
354
|
exports.removeItemResourceFile = removeItemResourceFile;
|
|
@@ -371,14 +364,16 @@ exports.removeItemResourceFile = removeItemResourceFile;
|
|
|
371
364
|
function updateItemResourceFile(itemId, filename, resource, authentication) {
|
|
372
365
|
// Prefix has to be specified separately
|
|
373
366
|
const prefixedFilenameParts = filename.split("/");
|
|
374
|
-
const prefix = prefixedFilenameParts.length > 1
|
|
367
|
+
const prefix = prefixedFilenameParts.length > 1
|
|
368
|
+
? prefixedFilenameParts.slice(0, prefixedFilenameParts.length - 1).join("/")
|
|
369
|
+
: undefined;
|
|
375
370
|
const suffix = prefixedFilenameParts[prefixedFilenameParts.length - 1];
|
|
376
371
|
return (0, arcgis_rest_portal_1.updateItemResource)({
|
|
377
372
|
id: itemId,
|
|
378
373
|
prefix: prefix,
|
|
379
374
|
name: suffix,
|
|
380
375
|
resource,
|
|
381
|
-
authentication: authentication
|
|
376
|
+
authentication: authentication,
|
|
382
377
|
});
|
|
383
378
|
}
|
|
384
379
|
exports.updateItemResourceFile = updateItemResourceFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceHelpers.js","sourceRoot":"","sources":["../../src/resourceHelpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,6CASsB;AACtB,iEAQkC;AAClC,qDAA6E;AAC7E,qHAA6G;AAC7G,qHAA6G;AAC7G,qDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"resourceHelpers.js","sourceRoot":"","sources":["../../src/resourceHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,11 +39,11 @@ function addResourceFromBlob(blob, itemId, folder, filename, authentication) {
|
|
|
39
39
|
resource: blob,
|
|
40
40
|
name: filename,
|
|
41
41
|
authentication: authentication,
|
|
42
|
-
params: {}
|
|
42
|
+
params: {},
|
|
43
43
|
};
|
|
44
44
|
if (folder) {
|
|
45
45
|
addRsrcOptions.params = {
|
|
46
|
-
resourcesPrefix: folder
|
|
46
|
+
resourcesPrefix: folder,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
return (0, arcgis_rest_portal_1.addItemResource)(addRsrcOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-resource-from-blob.js","sourceRoot":"","sources":["../../../src/resources/add-resource-from-blob.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,iEAA2D;AAC3D,mEAA4D;AAE5D;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CACjC,IAAS,EACT,MAAc,EACd,MAAc,EACd,QAAgB,EAChB,cAA2B;IAE3B,2FAA2F;IAC3F,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,
|
|
1
|
+
{"version":3,"file":"add-resource-from-blob.js","sourceRoot":"","sources":["../../../src/resources/add-resource-from-blob.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,iEAA2D;AAC3D,mEAA4D;AAE5D;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CACjC,IAAS,EACT,MAAc,EACd,MAAc,EACd,QAAgB,EAChB,cAA2B;IAE3B,2FAA2F;IAC3F,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,qCAAe,CAAC,qDAAqD,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,cAAc,GAAG;QACrB,EAAE,EAAE,MAAM;QACV,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,cAAc;QAC9B,MAAM,EAAE,EAAE;KACX,CAAC;IACF,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,MAAM,GAAG;YACtB,eAAe,EAAE,MAAM;SACxB,CAAC;KACH;IACD,OAAO,IAAA,oCAAe,EAAC,cAAc,CAAC,CAAC;AACzC,CAAC;AA3BD,kDA2BC"}
|
|
@@ -29,13 +29,13 @@ const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
|
|
|
29
29
|
function addMetadataFromBlob(blob, itemId, authentication) {
|
|
30
30
|
const updateOptions = {
|
|
31
31
|
item: {
|
|
32
|
-
id: itemId
|
|
32
|
+
id: itemId,
|
|
33
33
|
},
|
|
34
34
|
params: {
|
|
35
35
|
// Pass metadata in via params because item property is serialized, which discards a blob
|
|
36
|
-
metadata: blob
|
|
36
|
+
metadata: blob,
|
|
37
37
|
},
|
|
38
|
-
authentication: authentication
|
|
38
|
+
authentication: authentication,
|
|
39
39
|
};
|
|
40
40
|
return (0, arcgis_rest_portal_1.updateItem)(updateOptions);
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addMetadataFromBlob.js","sourceRoot":"","sources":["../../../src/resources/addMetadataFromBlob.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,iEAAsD;AAEtD,wHAAwH;AAExH;;;;;;;GAOG;AACH,SAAgB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"addMetadataFromBlob.js","sourceRoot":"","sources":["../../../src/resources/addMetadataFromBlob.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,iEAAsD;AAEtD,wHAAwH;AAExH;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc,EAAE,cAA2B;IACzF,MAAM,aAAa,GAAQ;QACzB,IAAI,EAAE;YACJ,EAAE,EAAE,MAAM;SACX;QACD,MAAM,EAAE;YACN,yFAAyF;YACzF,QAAQ,EAAE,IAAI;SACf;QACD,cAAc,EAAE,cAAc;KAC/B,CAAC;IACF,OAAO,IAAA,+BAAU,EAAC,aAAa,CAAC,CAAC;AACnC,CAAC;AAZD,kDAYC"}
|
|
@@ -42,7 +42,7 @@ const jszip_1 = tslib_1.__importDefault(require("jszip"));
|
|
|
42
42
|
* @returns A promise which resolves to a list of the result of the copies
|
|
43
43
|
*/
|
|
44
44
|
function copyFilesAsResources(files, destinationItemId, destinationAuthentication, filesPerZip = 40) {
|
|
45
|
-
return new Promise(resolve => {
|
|
45
|
+
return new Promise((resolve) => {
|
|
46
46
|
let awaitAllItems = [];
|
|
47
47
|
const zipInfos = [];
|
|
48
48
|
if (files.length > 0) {
|
|
@@ -57,9 +57,9 @@ function copyFilesAsResources(files, destinationItemId, destinationAuthenticatio
|
|
|
57
57
|
const zipInfo = {
|
|
58
58
|
filename: `resources${index}.zip`,
|
|
59
59
|
zip: new jszip_1.default(),
|
|
60
|
-
filelist: []
|
|
60
|
+
filelist: [],
|
|
61
61
|
};
|
|
62
|
-
awaitAllItems = awaitAllItems.concat(chunk.map(file => (0, copyResourceIntoZip_1.copyResourceIntoZip)(file, zipInfo)));
|
|
62
|
+
awaitAllItems = awaitAllItems.concat(chunk.map((file) => (0, copyResourceIntoZip_1.copyResourceIntoZip)(file, zipInfo)));
|
|
63
63
|
zipInfos.push(zipInfo);
|
|
64
64
|
});
|
|
65
65
|
}
|
|
@@ -73,8 +73,7 @@ function copyFilesAsResources(files, destinationItemId, destinationAuthenticatio
|
|
|
73
73
|
// | true | true | file has been fetched and sent to AGO |
|
|
74
74
|
// | true | undefined | file has been fetched and will be sent via zip |
|
|
75
75
|
// Filter out copiedToDestination===undefined; we'll get their status when we send their zip
|
|
76
|
-
results = results.filter((result) => !(result.fetchedFromSource &&
|
|
77
|
-
typeof result.copiedToDestination === "undefined"));
|
|
76
|
+
results = results.filter((result) => !(result.fetchedFromSource && typeof result.copiedToDestination === "undefined"));
|
|
78
77
|
// Now send the resources to AGO
|
|
79
78
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
80
79
|
_copyAssociatedFileZips(zipInfos, destinationItemId, destinationAuthentication).then((zipResults) => {
|
|
@@ -104,14 +103,13 @@ exports.copyFilesAsResources = copyFilesAsResources;
|
|
|
104
103
|
* @returns A promise which resolves to a list of the result of the copies
|
|
105
104
|
*/
|
|
106
105
|
async function copyAssociatedFilesByType(fileInfos, sourceAuthentication, sourceItemId, destinationItemId, destinationAuthentication, template = {}, templateDictionary = {}) {
|
|
107
|
-
return new Promise(resolve => {
|
|
106
|
+
return new Promise((resolve) => {
|
|
108
107
|
let awaitAllItems = [];
|
|
109
108
|
let resourceFileInfos = fileInfos;
|
|
110
109
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
111
110
|
awaitAllItems = fileInfos
|
|
112
|
-
.filter(fileInfo => fileInfo.type === interfaces_1.EFileType.Data ||
|
|
113
|
-
fileInfo
|
|
114
|
-
.map(fileInfo => {
|
|
111
|
+
.filter((fileInfo) => fileInfo.type === interfaces_1.EFileType.Data || fileInfo.type === interfaces_1.EFileType.Metadata)
|
|
112
|
+
.map((fileInfo) => {
|
|
115
113
|
// Handle Data and Metadata first
|
|
116
114
|
switch (fileInfo.type) {
|
|
117
115
|
case interfaces_1.EFileType.Data:
|
|
@@ -125,10 +123,10 @@ async function copyAssociatedFilesByType(fileInfos, sourceAuthentication, source
|
|
|
125
123
|
}
|
|
126
124
|
});
|
|
127
125
|
// Now add in the Resources
|
|
128
|
-
resourceFileInfos = fileInfos.filter(fileInfo => fileInfo.type === interfaces_1.EFileType.Info || fileInfo.type === interfaces_1.EFileType.Resource);
|
|
126
|
+
resourceFileInfos = fileInfos.filter((fileInfo) => fileInfo.type === interfaces_1.EFileType.Info || fileInfo.type === interfaces_1.EFileType.Resource);
|
|
129
127
|
const zipInfos = [];
|
|
130
128
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
131
|
-
const awaitAllResources = new Promise(resolve2 => {
|
|
129
|
+
const awaitAllResources = new Promise((resolve2) => {
|
|
132
130
|
if (resourceFileInfos.length > 0) {
|
|
133
131
|
// De-templatize as needed in files before adding them to the zip
|
|
134
132
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
@@ -144,10 +142,10 @@ async function copyAssociatedFilesByType(fileInfos, sourceAuthentication, source
|
|
|
144
142
|
const zipInfo = {
|
|
145
143
|
filename: `resources${index}.zip`,
|
|
146
144
|
zip: new jszip_1.default(),
|
|
147
|
-
filelist: []
|
|
145
|
+
filelist: [],
|
|
148
146
|
};
|
|
149
147
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
150
|
-
awaitAllItems = awaitAllItems.concat(chunk.map(fileInfo => {
|
|
148
|
+
awaitAllItems = awaitAllItems.concat(chunk.map((fileInfo) => {
|
|
151
149
|
return (0, copyResourceIntoZip_1.copyResourceIntoZipFromInfo)(fileInfo, sourceAuthentication, zipInfo);
|
|
152
150
|
}));
|
|
153
151
|
zipInfos.push(zipInfo);
|
|
@@ -171,8 +169,7 @@ async function copyAssociatedFilesByType(fileInfos, sourceAuthentication, source
|
|
|
171
169
|
// | true | true | file has been fetched and sent to AGO |
|
|
172
170
|
// | true | undefined | file has been fetched and will be sent via zip |
|
|
173
171
|
// Filter out copiedToDestination===undefined; we'll get their status when we send their zip
|
|
174
|
-
results = results.filter((result) => !(result.fetchedFromSource &&
|
|
175
|
-
typeof result.copiedToDestination === "undefined"));
|
|
172
|
+
results = results.filter((result) => !(result.fetchedFromSource && typeof result.copiedToDestination === "undefined"));
|
|
176
173
|
// Now send the resources to AGO
|
|
177
174
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
178
175
|
_copyAssociatedFileZips(zipInfos, destinationItemId, destinationAuthentication).then((zipResults) => {
|
|
@@ -198,7 +195,7 @@ exports.copyAssociatedFilesByType = copyAssociatedFilesByType;
|
|
|
198
195
|
* @private
|
|
199
196
|
*/
|
|
200
197
|
function _copyAssociatedFileZips(zipInfos, destinationItemId, destinationAuthentication) {
|
|
201
|
-
return new Promise(resolve => {
|
|
198
|
+
return new Promise((resolve) => {
|
|
202
199
|
const results = [];
|
|
203
200
|
// Filter out empty zips, which can happen when none of the files in the chunk going into a zip
|
|
204
201
|
// can be fetched; e.g., the only file is metadata.xml, and the source item doesn't have metadata
|
|
@@ -233,24 +230,22 @@ function _detemplatizeResources(sourceAuthentication, sourceItemId, itemTemplate
|
|
|
233
230
|
const synchronizePromises = [];
|
|
234
231
|
if (itemTemplate.type === "Vector Tile Service") {
|
|
235
232
|
// Get the root.json files
|
|
236
|
-
const rootJsonResources = fileInfos.filter(file => file.filename === "root.json");
|
|
233
|
+
const rootJsonResources = fileInfos.filter((file) => file.filename === "root.json");
|
|
237
234
|
const templatizedResourcePath = "{{" + sourceItemId + ".url}}";
|
|
238
235
|
const resourcePath = destinationAuthentication.portal + "/content/items/" + itemTemplate.itemId;
|
|
239
236
|
const replacer = new RegExp(templatizedResourcePath, "g");
|
|
240
237
|
// Templatize the paths in the files that reference the source item id
|
|
241
|
-
rootJsonResources.forEach(rootFileResource => {
|
|
238
|
+
rootJsonResources.forEach((rootFileResource) => {
|
|
242
239
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
243
|
-
synchronizePromises.push(new Promise(resolve => {
|
|
240
|
+
synchronizePromises.push(new Promise((resolve) => {
|
|
244
241
|
// Fetch the file
|
|
245
242
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
246
243
|
(0, restHelpersGet_1.getBlobAsFile)(rootFileResource.url, rootFileResource.filename, sourceAuthentication).then((file) => {
|
|
247
244
|
// Read the file
|
|
248
245
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
249
|
-
(0, generalHelpers_1.blobToJson)(file)
|
|
250
|
-
.then(fileJson => {
|
|
246
|
+
(0, generalHelpers_1.blobToJson)(file).then((fileJson) => {
|
|
251
247
|
// Templatize by turning JSON into string, replacing paths with template, and re-JSONing
|
|
252
|
-
const updatedFileJson = JSON.parse(JSON.stringify(fileJson)
|
|
253
|
-
.replace(replacer, resourcePath));
|
|
248
|
+
const updatedFileJson = JSON.parse(JSON.stringify(fileJson).replace(replacer, resourcePath));
|
|
254
249
|
// Write the changes back into the file
|
|
255
250
|
rootFileResource.file = (0, generalHelpers_1.jsonToFile)(updatedFileJson, rootFileResource.filename);
|
|
256
251
|
rootFileResource.url = "";
|
|
@@ -263,22 +258,21 @@ function _detemplatizeResources(sourceAuthentication, sourceItemId, itemTemplate
|
|
|
263
258
|
else if (itemTemplate.type === "Geoprocessing Service") {
|
|
264
259
|
const paths = {};
|
|
265
260
|
paths[`{{${sourceItemId}.itemId}}`] = itemTemplate.itemId;
|
|
266
|
-
itemTemplate.dependencies.forEach(id => {
|
|
261
|
+
itemTemplate.dependencies.forEach((id) => {
|
|
267
262
|
paths[`{{${id}.itemId}}`] = templateDictionary[id].itemId;
|
|
268
263
|
});
|
|
269
|
-
fileInfos.forEach(fileResource => {
|
|
264
|
+
fileInfos.forEach((fileResource) => {
|
|
270
265
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
271
|
-
synchronizePromises.push(new Promise(resolve => {
|
|
266
|
+
synchronizePromises.push(new Promise((resolve) => {
|
|
272
267
|
// Fetch the file
|
|
273
268
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
274
269
|
(0, restHelpersGet_1.getBlobAsFile)(fileResource.url, fileResource.filename, sourceAuthentication).then((file) => {
|
|
275
270
|
// Read the file
|
|
276
271
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
277
|
-
(0, generalHelpers_1.blobToJson)(file)
|
|
278
|
-
.then(fileJson => {
|
|
272
|
+
(0, generalHelpers_1.blobToJson)(file).then((fileJson) => {
|
|
279
273
|
// DeTemplatize by turning JSON into string, replacing paths with new value, and re-JSONing
|
|
280
274
|
let fileString = JSON.stringify(fileJson);
|
|
281
|
-
Object.keys(paths).forEach(k => {
|
|
275
|
+
Object.keys(paths).forEach((k) => {
|
|
282
276
|
const replacer = new RegExp(k, "g");
|
|
283
277
|
fileString = fileString.replace(replacer, paths[k]);
|
|
284
278
|
});
|
|
@@ -304,7 +298,7 @@ exports._detemplatizeResources = _detemplatizeResources;
|
|
|
304
298
|
* @returns A promise which resolves to a list of the result of the copies
|
|
305
299
|
*/
|
|
306
300
|
function _sendZipsSeriallyToItem(zipInfos, destinationItemId, destinationAuthentication) {
|
|
307
|
-
return new Promise(resolve => {
|
|
301
|
+
return new Promise((resolve) => {
|
|
308
302
|
let allResults = [];
|
|
309
303
|
// Remove zip from bottom of list
|
|
310
304
|
const zipInfoToSend = zipInfos.pop();
|
|
@@ -317,7 +311,7 @@ function _sendZipsSeriallyToItem(zipInfos, destinationItemId, destinationAuthent
|
|
|
317
311
|
.then((response) => {
|
|
318
312
|
allResults = response;
|
|
319
313
|
// Stall a little to give AGO time to catch up
|
|
320
|
-
return new Promise(resolveSleep => {
|
|
314
|
+
return new Promise((resolveSleep) => {
|
|
321
315
|
setTimeout(() => resolveSleep(), 1000);
|
|
322
316
|
});
|
|
323
317
|
})
|