@esri/solution-common 1.1.2 → 1.2.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/esm/completeItem.js +6 -7
- package/dist/esm/completeItem.js.map +1 -1
- package/dist/esm/create-hub-request-options.d.ts +4 -4
- package/dist/esm/create-hub-request-options.js +9 -12
- package/dist/esm/create-hub-request-options.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteEmptyGroups.js +2 -2
- package/dist/esm/deleteHelpers/deleteEmptyGroups.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteGroupIfEmpty.js +15 -15
- package/dist/esm/deleteHelpers/deleteGroupIfEmpty.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteSolutionContents.js +20 -22
- package/dist/esm/deleteHelpers/deleteSolutionContents.js.map +1 -1
- package/dist/esm/deleteHelpers/deleteSolutionFolder.js +10 -10
- 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 +1 -1
- package/dist/esm/deleteHelpers/reconstructBuildOrderIds.js.map +1 -1
- package/dist/esm/deleteHelpers/removeItems.js +20 -29
- package/dist/esm/deleteHelpers/removeItems.js.map +1 -1
- package/dist/esm/deleteHelpers/reportProgress.js +3 -6
- package/dist/esm/deleteHelpers/reportProgress.js.map +1 -1
- package/dist/esm/deleteSolution.js +10 -12
- package/dist/esm/deleteSolution.js.map +1 -1
- package/dist/esm/dependencies.js +27 -19
- package/dist/esm/dependencies.js.map +1 -1
- package/dist/esm/featureServiceHelpers.d.ts +6 -0
- package/dist/esm/featureServiceHelpers.js +530 -500
- package/dist/esm/featureServiceHelpers.js.map +1 -1
- package/dist/esm/generalHelpers.js +72 -76
- package/dist/esm/generalHelpers.js.map +1 -1
- package/dist/esm/get-subscription-info.js +5 -3
- package/dist/esm/get-subscription-info.js.map +1 -1
- package/dist/esm/getDeletableSolutionInfo.js +6 -10
- package/dist/esm/getDeletableSolutionInfo.js.map +1 -1
- package/dist/esm/getSolutionSummary.js +15 -19
- package/dist/esm/getSolutionSummary.js.map +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/interfaces.d.ts +39 -1
- package/dist/esm/interfaces.js +3 -3
- package/dist/esm/interfaces.js.map +1 -1
- package/dist/esm/libConnectors.js +5 -7
- package/dist/esm/libConnectors.js.map +1 -1
- package/dist/esm/migrations/apply-schema.js +3 -3
- package/dist/esm/migrations/apply-schema.js.map +1 -1
- package/dist/esm/migrations/is-legacy-solution.js +2 -2
- package/dist/esm/migrations/is-legacy-solution.js.map +1 -1
- package/dist/esm/migrations/upgrade-three-dot-one.js +3 -3
- package/dist/esm/migrations/upgrade-three-dot-one.js.map +1 -1
- package/dist/esm/migrations/upgrade-three-dot-zero.js +1 -1
- package/dist/esm/migrations/upgrade-three-dot-zero.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-five.js +17 -8
- package/dist/esm/migrations/upgrade-two-dot-five.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-four.js +12 -12
- package/dist/esm/migrations/upgrade-two-dot-four.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-one.js +1 -1
- package/dist/esm/migrations/upgrade-two-dot-one.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-seven.js +1 -1
- package/dist/esm/migrations/upgrade-two-dot-seven.js.map +1 -1
- package/dist/esm/migrations/upgrade-two-dot-six.js +9 -12
- 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 +8 -9
- package/dist/esm/migrations/upgrade-two-dot-zero.js.map +1 -1
- package/dist/esm/migrator.js +5 -7
- package/dist/esm/migrator.js.map +1 -1
- package/dist/esm/polyfills.js +5 -5
- package/dist/esm/polyfills.js.map +1 -1
- package/dist/esm/resourceHelpers.js +54 -57
- 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 +1 -1
- package/dist/esm/resources/addMetadataFromBlob.js.map +1 -1
- package/dist/esm/resources/convert-item-resource-to-storage-resource.js +6 -7
- package/dist/esm/resources/convert-item-resource-to-storage-resource.js.map +1 -1
- package/dist/esm/resources/convert-storage-resource-to-item-resource.js +8 -9
- package/dist/esm/resources/convert-storage-resource-to-item-resource.js.map +1 -1
- package/dist/esm/resources/copyAssociatedFiles.js +44 -53
- package/dist/esm/resources/copyAssociatedFiles.js.map +1 -1
- package/dist/esm/resources/copyDataIntoItem.js +5 -11
- package/dist/esm/resources/copyDataIntoItem.js.map +1 -1
- package/dist/esm/resources/copyMetadataIntoItem.js +4 -10
- package/dist/esm/resources/copyMetadataIntoItem.js.map +1 -1
- package/dist/esm/resources/copyResourceIntoZip.js +5 -7
- package/dist/esm/resources/copyResourceIntoZip.js.map +1 -1
- package/dist/esm/resources/copyZipIntoItem.js +5 -9
- package/dist/esm/resources/copyZipIntoItem.js.map +1 -1
- package/dist/esm/resources/createCopyResults.js +5 -2
- package/dist/esm/resources/createCopyResults.js.map +1 -1
- package/dist/esm/resources/get-blob.js +7 -5
- package/dist/esm/resources/get-blob.js.map +1 -1
- package/dist/esm/resources/getItemResourcesFilesFromPaths.js +7 -7
- package/dist/esm/resources/getItemResourcesFilesFromPaths.js.map +1 -1
- package/dist/esm/resources/getItemResourcesPaths.js +7 -8
- package/dist/esm/resources/getItemResourcesPaths.js.map +1 -1
- package/dist/esm/resources/transform-resource-paths-to-solution-resources.js +8 -9
- package/dist/esm/resources/transform-resource-paths-to-solution-resources.js.map +1 -1
- package/dist/esm/restHelpers.d.ts +65 -5
- package/dist/esm/restHelpers.js +422 -276
- package/dist/esm/restHelpers.js.map +1 -1
- package/dist/esm/restHelpersGet.js +102 -111
- package/dist/esm/restHelpersGet.js.map +1 -1
- package/dist/esm/sharing/share-item-to-groups.d.ts +2 -1
- package/dist/esm/sharing/share-item-to-groups.js +12 -6
- package/dist/esm/sharing/share-item-to-groups.js.map +1 -1
- package/dist/esm/templatization.js +64 -40
- package/dist/esm/templatization.js.map +1 -1
- package/dist/esm/trackingHelpers.d.ts +116 -0
- package/dist/esm/trackingHelpers.js +205 -0
- package/dist/esm/trackingHelpers.js.map +1 -0
- package/dist/esm/velocityHelpers.d.ts +2 -0
- package/dist/esm/velocityHelpers.js +30 -12
- package/dist/esm/velocityHelpers.js.map +1 -1
- package/dist/esm/workforceHelpers.d.ts +11 -0
- package/dist/esm/workforceHelpers.js +208 -180
- package/dist/esm/workforceHelpers.js.map +1 -1
- package/dist/node/completeItem.js +8 -9
- package/dist/node/completeItem.js.map +1 -1
- package/dist/node/create-hub-request-options.d.ts +4 -4
- package/dist/node/create-hub-request-options.js +11 -14
- package/dist/node/create-hub-request-options.js.map +1 -1
- package/dist/node/deleteHelpers/deleteEmptyGroups.js +3 -3
- package/dist/node/deleteHelpers/deleteEmptyGroups.js.map +1 -1
- package/dist/node/deleteHelpers/deleteGroupIfEmpty.js +16 -16
- package/dist/node/deleteHelpers/deleteGroupIfEmpty.js.map +1 -1
- package/dist/node/deleteHelpers/deleteSolutionContents.js +26 -28
- package/dist/node/deleteHelpers/deleteSolutionContents.js.map +1 -1
- package/dist/node/deleteHelpers/deleteSolutionFolder.js +11 -11
- package/dist/node/deleteHelpers/deleteSolutionFolder.js.map +1 -1
- package/dist/node/deleteHelpers/deleteSolutionItem.js +6 -6
- package/dist/node/deleteHelpers/deleteSolutionItem.js.map +1 -1
- package/dist/node/deleteHelpers/index.js +1 -1
- package/dist/node/deleteHelpers/reconstructBuildOrderIds.js +2 -2
- package/dist/node/deleteHelpers/reconstructBuildOrderIds.js.map +1 -1
- package/dist/node/deleteHelpers/removeItems.js +26 -35
- package/dist/node/deleteHelpers/removeItems.js.map +1 -1
- package/dist/node/deleteHelpers/reportProgress.js +4 -7
- package/dist/node/deleteHelpers/reportProgress.js.map +1 -1
- package/dist/node/deleteSolution.js +12 -14
- package/dist/node/deleteSolution.js.map +1 -1
- package/dist/node/dependencies.js +29 -21
- package/dist/node/dependencies.js.map +1 -1
- package/dist/node/featureServiceHelpers.d.ts +6 -0
- package/dist/node/featureServiceHelpers.js +535 -504
- package/dist/node/featureServiceHelpers.js.map +1 -1
- package/dist/node/generalHelpers.js +75 -79
- package/dist/node/generalHelpers.js.map +1 -1
- package/dist/node/get-subscription-info.js +7 -5
- package/dist/node/get-subscription-info.js.map +1 -1
- package/dist/node/getDeletableSolutionInfo.js +8 -12
- package/dist/node/getDeletableSolutionInfo.js.map +1 -1
- package/dist/node/getSolutionSummary.js +19 -23
- package/dist/node/getSolutionSummary.js.map +1 -1
- package/dist/node/index.d.ts +1 -0
- package/dist/node/index.js +2 -1
- package/dist/node/index.js.map +1 -1
- package/dist/node/interfaces.d.ts +39 -1
- package/dist/node/interfaces.js.map +1 -1
- package/dist/node/libConnectors.js +8 -10
- package/dist/node/libConnectors.js.map +1 -1
- package/dist/node/migrations/apply-schema.js +4 -4
- package/dist/node/migrations/apply-schema.js.map +1 -1
- package/dist/node/migrations/is-legacy-solution.js +3 -3
- package/dist/node/migrations/is-legacy-solution.js.map +1 -1
- package/dist/node/migrations/upgrade-three-dot-one.js +5 -5
- package/dist/node/migrations/upgrade-three-dot-one.js.map +1 -1
- package/dist/node/migrations/upgrade-three-dot-zero.js +2 -2
- package/dist/node/migrations/upgrade-three-dot-zero.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-five.js +18 -9
- package/dist/node/migrations/upgrade-two-dot-five.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-four.js +13 -13
- package/dist/node/migrations/upgrade-two-dot-four.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-one.js +2 -2
- package/dist/node/migrations/upgrade-two-dot-one.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-seven.js +2 -2
- package/dist/node/migrations/upgrade-two-dot-seven.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-six.js +10 -13
- package/dist/node/migrations/upgrade-two-dot-six.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-three.js +5 -5
- package/dist/node/migrations/upgrade-two-dot-three.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-two.js +5 -5
- package/dist/node/migrations/upgrade-two-dot-two.js.map +1 -1
- package/dist/node/migrations/upgrade-two-dot-zero.js +9 -10
- package/dist/node/migrations/upgrade-two-dot-zero.js.map +1 -1
- package/dist/node/migrator.js +16 -18
- package/dist/node/migrator.js.map +1 -1
- package/dist/node/polyfills.js +5 -5
- package/dist/node/polyfills.js.map +1 -1
- package/dist/node/resourceHelpers.js +62 -65
- package/dist/node/resourceHelpers.js.map +1 -1
- package/dist/node/resources/add-resource-from-blob.js +4 -4
- package/dist/node/resources/add-resource-from-blob.js.map +1 -1
- package/dist/node/resources/addMetadataFromBlob.js +2 -2
- package/dist/node/resources/addMetadataFromBlob.js.map +1 -1
- package/dist/node/resources/convert-item-resource-to-storage-resource.js +6 -7
- package/dist/node/resources/convert-item-resource-to-storage-resource.js.map +1 -1
- package/dist/node/resources/convert-storage-resource-to-item-resource.js +9 -10
- package/dist/node/resources/convert-storage-resource-to-item-resource.js.map +1 -1
- package/dist/node/resources/copyAssociatedFiles.js +52 -61
- package/dist/node/resources/copyAssociatedFiles.js.map +1 -1
- package/dist/node/resources/copyDataIntoItem.js +9 -15
- package/dist/node/resources/copyDataIntoItem.js.map +1 -1
- package/dist/node/resources/copyMetadataIntoItem.js +7 -13
- package/dist/node/resources/copyMetadataIntoItem.js.map +1 -1
- package/dist/node/resources/copyResourceIntoZip.js +7 -9
- package/dist/node/resources/copyResourceIntoZip.js.map +1 -1
- package/dist/node/resources/copyZipIntoItem.js +8 -12
- package/dist/node/resources/copyZipIntoItem.js.map +1 -1
- package/dist/node/resources/createCopyResults.js +5 -2
- package/dist/node/resources/createCopyResults.js.map +1 -1
- package/dist/node/resources/get-blob.js +8 -6
- package/dist/node/resources/get-blob.js.map +1 -1
- package/dist/node/resources/getItemResourcesFilesFromPaths.js +8 -8
- package/dist/node/resources/getItemResourcesFilesFromPaths.js.map +1 -1
- package/dist/node/resources/getItemResourcesPaths.js +9 -10
- package/dist/node/resources/getItemResourcesPaths.js.map +1 -1
- package/dist/node/resources/index.js +1 -1
- package/dist/node/resources/transform-resource-paths-to-solution-resources.js +10 -11
- package/dist/node/resources/transform-resource-paths-to-solution-resources.js.map +1 -1
- package/dist/node/restHelpers.d.ts +65 -5
- package/dist/node/restHelpers.js +437 -285
- package/dist/node/restHelpers.js.map +1 -1
- package/dist/node/restHelpersGet.js +107 -116
- package/dist/node/restHelpersGet.js.map +1 -1
- package/dist/node/sharing/index.js +1 -1
- package/dist/node/sharing/share-item-to-groups.d.ts +2 -1
- package/dist/node/sharing/share-item-to-groups.js +13 -7
- package/dist/node/sharing/share-item-to-groups.js.map +1 -1
- package/dist/node/templatization.js +61 -37
- package/dist/node/templatization.js.map +1 -1
- package/dist/node/trackingHelpers.d.ts +116 -0
- package/dist/node/trackingHelpers.js +217 -0
- package/dist/node/trackingHelpers.js.map +1 -0
- package/dist/node/velocityHelpers.d.ts +2 -0
- package/dist/node/velocityHelpers.js +33 -15
- package/dist/node/velocityHelpers.js.map +1 -1
- package/dist/node/workforceHelpers.d.ts +11 -0
- package/dist/node/workforceHelpers.js +214 -185
- package/dist/node/workforceHelpers.js.map +1 -1
- package/dist/umd/common.umd.js +14830 -14466
- package/dist/umd/common.umd.js.map +1 -1
- package/dist/umd/common.umd.min.js +3 -3
- package/dist/umd/common.umd.min.js.map +1 -1
- package/dist/umd/create-hub-request-options.d.ts +4 -4
- package/dist/umd/featureServiceHelpers.d.ts +6 -0
- package/dist/umd/index.d.ts +1 -0
- package/dist/umd/interfaces.d.ts +39 -1
- package/dist/umd/restHelpers.d.ts +65 -5
- package/dist/umd/sharing/share-item-to-groups.d.ts +2 -1
- package/dist/umd/trackingHelpers.d.ts +116 -0
- package/dist/umd/velocityHelpers.d.ts +2 -0
- package/dist/umd/workforceHelpers.d.ts +11 -0
- package/package.json +24 -24
package/dist/esm/completeItem.js
CHANGED
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { __read } from "tslib";
|
|
17
16
|
import * as restHelpers from "./restHelpers";
|
|
18
17
|
import * as restHelpersGet from "./restHelpersGet";
|
|
19
18
|
// ------------------------------------------------------------------------------------------------------------------ //
|
|
@@ -25,11 +24,11 @@ import * as restHelpersGet from "./restHelpersGet";
|
|
|
25
24
|
* @return Promise that will resolve with everything known about the item
|
|
26
25
|
*/
|
|
27
26
|
export function getCompleteItem(itemId, authentication) {
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
let itemBase;
|
|
28
|
+
let completeItem;
|
|
30
29
|
return restHelpersGet
|
|
31
30
|
.getItemBase(itemId, authentication)
|
|
32
|
-
.then(
|
|
31
|
+
.then((response) => {
|
|
33
32
|
itemBase = response;
|
|
34
33
|
return Promise.all([
|
|
35
34
|
restHelpersGet.getItemDataAsFile(itemId, itemBase.name, authentication),
|
|
@@ -40,8 +39,8 @@ export function getCompleteItem(itemId, authentication) {
|
|
|
40
39
|
restHelpersGet.getItemRelatedItemsInSameDirection(itemId, "reverse", authentication)
|
|
41
40
|
]);
|
|
42
41
|
})
|
|
43
|
-
.then(
|
|
44
|
-
|
|
42
|
+
.then(responses => {
|
|
43
|
+
const [itemData, itemThumbnail, itemMetadata, itemResources, itemFwdRelatedItems, itemRevRelatedItems] = responses;
|
|
45
44
|
// Summarize what we have
|
|
46
45
|
// ----------------------
|
|
47
46
|
// (itemBase: IItem) text/plain JSON
|
|
@@ -68,7 +67,7 @@ export function getCompleteItem(itemId, authentication) {
|
|
|
68
67
|
return Promise.resolve(null);
|
|
69
68
|
}
|
|
70
69
|
})
|
|
71
|
-
.then(
|
|
70
|
+
.then((properties) => {
|
|
72
71
|
if (properties) {
|
|
73
72
|
completeItem.featureServiceProperties = properties;
|
|
74
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeItem.js","sourceRoot":"","sources":["../../src/completeItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"completeItem.js","sourceRoot":"","sources":["../../src/completeItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAaH,OAAO,KAAK,WAAW,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AAEnD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAc,EACd,cAA2B;IAE3B,IAAI,QAAa,CAAC;IAClB,IAAI,YAAiB,CAAC;IAEtB,OAAO,cAAc;SAClB,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC;SACnC,IAAI,CAAC,CAAC,QAAa,EAAE,EAAE;QACtB,QAAQ,GAAG,QAAQ,CAAC;QAEpB,OAAO,OAAO,CAAC,GAAG,CAAC;YACjB,cAAc,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;YACvE,cAAc,CAAC,sBAAsB,CACnC,MAAM,EACN,QAAQ,CAAC,SAAS,EAClB,KAAK,EACL,cAAc,CACf;YACD,cAAc,CAAC,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC;YAC5D,cAAc,CAAC,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC;YAC5D,cAAc,CAAC,kCAAkC,CAC/C,MAAM,EACN,SAAS,EACT,cAAc,CACf;YACD,cAAc,CAAC,kCAAkC,CAC/C,MAAM,EACN,SAAS,EACT,cAAc,CACf;SACF,CAAC,CAAC;IACL,CAAC,CAAC;SACD,IAAI,CAAC,SAAS,CAAC,EAAE;QAChB,MAAM,CACJ,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,mBAAmB,CACpB,GAAG,SAAS,CAAC;QACd,yBAAyB;QACzB,yBAAyB;QACzB,qCAAqC;QACrC,wBAAwB;QACxB,iCAAiC;QACjC,wCAAwC;QACxC,uCAAuC;QACvC,gGAAgG;QAChG,gGAAgG;QAChG,YAAY,GAAG;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,aAAa;YACxB,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,aAAa;YACxB,eAAe,EAAE,mBAAmB;YACpC,eAAe,EAAE,mBAAmB;SACrC,CAAC;QAEF,IAAI,QAAQ,CAAC,IAAI,KAAK,iBAAiB,EAAE;YACvC,mEAAmE;YACnE,OAAO,WAAW,CAAC,2BAA2B,CAC5C,QAAQ,CAAC,GAAG,EACZ,cAAc,CACf,CAAC;SACH;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,UAAqC,EAAE,EAAE;QAC9C,IAAI,UAAU,EAAE;YACd,YAAY,CAAC,wBAAwB,GAAG,UAAU,CAAC;SACpD;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { UserSession } from "./interfaces";
|
|
17
|
-
import {
|
|
17
|
+
import { IHubUserRequestOptions } from "@esri/hub-common";
|
|
18
18
|
/**
|
|
19
|
-
* Create a
|
|
19
|
+
* Create a IHubUserRequestOptions object from
|
|
20
20
|
* the UserSession
|
|
21
21
|
* If passed, it will use `templateDictionary`
|
|
22
22
|
* values instead of making additional requests
|
|
@@ -24,6 +24,6 @@ import { IHubRequestOptions } from "@esri/hub-common";
|
|
|
24
24
|
* @export
|
|
25
25
|
* @param {UserSession} authentication
|
|
26
26
|
* @param {*} templateDictionary
|
|
27
|
-
* @returns {
|
|
27
|
+
* @returns {IHubUserRequestOptions}
|
|
28
28
|
*/
|
|
29
|
-
export declare function createHubRequestOptions(authentication: UserSession, templateDictionary?: any): Promise<
|
|
29
|
+
export declare function createHubRequestOptions(authentication: UserSession, templateDictionary?: any): Promise<IHubUserRequestOptions>;
|
|
@@ -13,11 +13,10 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { __read } from "tslib";
|
|
17
16
|
import { getHubUrlFromPortal } from "@esri/hub-common";
|
|
18
17
|
import { getSelf, getUser } from "@esri/arcgis-rest-portal";
|
|
19
18
|
/**
|
|
20
|
-
* Create a
|
|
19
|
+
* Create a IHubUserRequestOptions object from
|
|
21
20
|
* the UserSession
|
|
22
21
|
* If passed, it will use `templateDictionary`
|
|
23
22
|
* values instead of making additional requests
|
|
@@ -25,9 +24,9 @@ import { getSelf, getUser } from "@esri/arcgis-rest-portal";
|
|
|
25
24
|
* @export
|
|
26
25
|
* @param {UserSession} authentication
|
|
27
26
|
* @param {*} templateDictionary
|
|
28
|
-
* @returns {
|
|
27
|
+
* @returns {IHubUserRequestOptions}
|
|
29
28
|
*/
|
|
30
|
-
export function createHubRequestOptions(authentication, templateDictionary) {
|
|
29
|
+
export function createHubRequestOptions(authentication, templateDictionary = {}) {
|
|
31
30
|
// We used to pull the user
|
|
32
31
|
// the template dictionary, but ran into issues
|
|
33
32
|
// with the user.groups being filtered to groups
|
|
@@ -35,22 +34,20 @@ export function createHubRequestOptions(authentication, templateDictionary) {
|
|
|
35
34
|
// this was problematic as we need to check if the user
|
|
36
35
|
// can add more groups, based on how close they are to
|
|
37
36
|
// the max 512 group limit.
|
|
38
|
-
if (templateDictionary === void 0) { templateDictionary = {}; }
|
|
39
37
|
// At this time we are simply fetching the user directly
|
|
40
|
-
|
|
38
|
+
const promises = [];
|
|
41
39
|
if (templateDictionary.organization) {
|
|
42
40
|
promises.push(Promise.resolve(templateDictionary.organization));
|
|
43
41
|
}
|
|
44
42
|
else {
|
|
45
|
-
promises.push(getSelf({ authentication
|
|
43
|
+
promises.push(getSelf({ authentication }));
|
|
46
44
|
}
|
|
47
45
|
// always get the user
|
|
48
|
-
promises.push(getUser({ authentication
|
|
49
|
-
return Promise.all(promises).then(
|
|
50
|
-
var _b = __read(_a, 2), pSelf = _b[0], user = _b[1];
|
|
46
|
+
promises.push(getUser({ authentication }));
|
|
47
|
+
return Promise.all(promises).then(([pSelf, user]) => {
|
|
51
48
|
pSelf.user = user;
|
|
52
|
-
|
|
53
|
-
authentication
|
|
49
|
+
const ro = {
|
|
50
|
+
authentication,
|
|
54
51
|
portalSelf: pSelf,
|
|
55
52
|
isPortal: pSelf.isPortal
|
|
56
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-hub-request-options.js","sourceRoot":"","sources":["../../src/create-hub-request-options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"create-hub-request-options.js","sourceRoot":"","sources":["../../src/create-hub-request-options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAA0B,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAE5D;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CACrC,cAA2B,EAC3B,qBAA0B,EAAE;IAE5B,2BAA2B;IAC3B,+CAA+C;IAC/C,gDAAgD;IAChD,mDAAmD;IACnD,uDAAuD;IACvD,sDAAsD;IACtD,2BAA2B;IAE3B,wDAAwD;IACxD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,IAAI,kBAAkB,CAAC,YAAY,EAAE;QACnC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;KACjE;SAAM;QACL,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;KAC5C;IACD,sBAAsB;IACtB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IAE3C,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAClD,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,EAAE,GAAG;YACT,cAAc;YACd,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACC,CAAC;QAE5B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACnB,EAAE,CAAC,SAAS,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;SAC3C;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -30,9 +30,9 @@ export function deleteEmptyGroups(groups, authentication) {
|
|
|
30
30
|
return Promise.resolve([]);
|
|
31
31
|
}
|
|
32
32
|
// Attempt to delete each group
|
|
33
|
-
return Promise.all(groups.map(
|
|
33
|
+
return Promise.all(groups.map(groupId => deleteGroupIfEmpty(groupId, authentication))).then((responses) => {
|
|
34
34
|
// Return just the group ids that succeeded
|
|
35
|
-
return groups.filter(
|
|
35
|
+
return groups.filter((groupId, index) => responses[index]);
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
//# sourceMappingURL=deleteEmptyGroups.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteEmptyGroups.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteEmptyGroups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAgB,EAChB,cAA2B;IAE3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAC5B;IAED,+BAA+B;IAC/B,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"deleteEmptyGroups.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteEmptyGroups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAgB,EAChB,cAA2B;IAE3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAC5B;IAED,+BAA+B;IAC/B,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CACnE,CAAC,IAAI,CAAC,CAAC,SAAoB,EAAE,EAAE;QAC9B,2CAA2C;QAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAe,EAAE,KAAa,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -23,32 +23,32 @@ import * as portal from "@esri/arcgis-rest-portal";
|
|
|
23
23
|
* @return Promise indicating if group was deleted
|
|
24
24
|
*/
|
|
25
25
|
export function deleteGroupIfEmpty(groupId, authentication) {
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
let username;
|
|
27
|
+
let isGroupProtected;
|
|
28
28
|
// Get the owner tied to the authentication
|
|
29
29
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
30
30
|
return authentication
|
|
31
31
|
.getUsername()
|
|
32
|
-
.then(
|
|
32
|
+
.then(response => {
|
|
33
33
|
username = response;
|
|
34
34
|
// We need to know the owner and protection status of the group
|
|
35
|
-
return portal.getGroup(groupId, { authentication
|
|
35
|
+
return portal.getGroup(groupId, { authentication });
|
|
36
36
|
})
|
|
37
|
-
.then(
|
|
37
|
+
.then((group) => {
|
|
38
38
|
if (group.owner !== username) {
|
|
39
39
|
return Promise.resolve(null); // don't delete a group we don't own
|
|
40
40
|
}
|
|
41
41
|
isGroupProtected = group.protected; // do we need to unprotect before deleting?
|
|
42
42
|
// Get the number of items in the group
|
|
43
|
-
|
|
43
|
+
const groupContentOptions = {
|
|
44
44
|
paging: {
|
|
45
45
|
num: 1 // only need 1 item to show that group is not empty
|
|
46
46
|
},
|
|
47
|
-
authentication
|
|
47
|
+
authentication
|
|
48
48
|
};
|
|
49
49
|
return portal.getGroupContent(groupId, groupContentOptions);
|
|
50
50
|
})
|
|
51
|
-
.then(
|
|
51
|
+
.then((groupContent) => {
|
|
52
52
|
// should be IGroupContentResult; see https://github.com/Esri/arcgis-rest-js/pull/858/files
|
|
53
53
|
// If groupContent is null, then we don't own the group; if the group is not empty, then we can't delete it
|
|
54
54
|
if (!groupContent || groupContent.total > 0) {
|
|
@@ -56,9 +56,9 @@ export function deleteGroupIfEmpty(groupId, authentication) {
|
|
|
56
56
|
}
|
|
57
57
|
// We're going ahead with deletion; first unprotect it if necessary
|
|
58
58
|
if (isGroupProtected) {
|
|
59
|
-
|
|
59
|
+
const groupOptions = {
|
|
60
60
|
id: groupId,
|
|
61
|
-
authentication
|
|
61
|
+
authentication
|
|
62
62
|
};
|
|
63
63
|
return portal.unprotectGroup(groupOptions);
|
|
64
64
|
}
|
|
@@ -66,12 +66,12 @@ export function deleteGroupIfEmpty(groupId, authentication) {
|
|
|
66
66
|
return Promise.resolve({ success: true });
|
|
67
67
|
}
|
|
68
68
|
})
|
|
69
|
-
.then(
|
|
69
|
+
.then(response => {
|
|
70
70
|
if (response.success) {
|
|
71
71
|
// All is good so far: we own the group, it's empty, and it's unprotected; proceed with deletion
|
|
72
|
-
|
|
72
|
+
const groupOptions = {
|
|
73
73
|
id: groupId,
|
|
74
|
-
authentication
|
|
74
|
+
authentication
|
|
75
75
|
};
|
|
76
76
|
return portal.removeGroup(groupOptions);
|
|
77
77
|
}
|
|
@@ -80,11 +80,11 @@ export function deleteGroupIfEmpty(groupId, authentication) {
|
|
|
80
80
|
return Promise.resolve({ success: false });
|
|
81
81
|
}
|
|
82
82
|
})
|
|
83
|
-
.then(
|
|
83
|
+
.then((response) => {
|
|
84
84
|
// Return a simple response
|
|
85
85
|
return Promise.resolve(response.success);
|
|
86
86
|
})
|
|
87
|
-
.catch(
|
|
87
|
+
.catch(() => {
|
|
88
88
|
// In case getGroup or getGroupContent fails
|
|
89
89
|
return Promise.resolve(false);
|
|
90
90
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteGroupIfEmpty.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteGroupIfEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AAEnD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,cAA2B;IAE3B,IAAI,QAAgB,CAAC;IACrB,IAAI,gBAAyB,CAAC;IAE9B,2CAA2C;IAC3C,mEAAmE;IACnE,OAAO,cAAc;SAClB,WAAW,EAAE;SACb,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"deleteGroupIfEmpty.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteGroupIfEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AAEnD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,cAA2B;IAE3B,IAAI,QAAgB,CAAC;IACrB,IAAI,gBAAyB,CAAC;IAE9B,2CAA2C;IAC3C,mEAAmE;IACnE,OAAO,cAAc;SAClB,WAAW,EAAE;SACb,IAAI,CAAC,QAAQ,CAAC,EAAE;QACf,QAAQ,GAAG,QAAQ,CAAC;QAEpB,+DAA+D;QAC/D,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,KAAoB,EAAE,EAAE;QAC7B,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE;YAC5B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC;SACnE;QACD,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,2CAA2C;QAE/E,uCAAuC;QACvC,MAAM,mBAAmB,GAAmC;YAC1D,MAAM,EAAE;gBACN,GAAG,EAAE,CAAC,CAAC,mDAAmD;aAC3D;YACD,cAAc;SACf,CAAC;QACF,OAAO,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAC9D,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,YAAiB,EAAE,EAAE;QAC1B,2FAA2F;QAC3F,2GAA2G;QAC3G,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,KAAK,GAAG,CAAC,EAAE;YAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,wCAAwC;SACrF;QAED,mEAAmE;QACnE,IAAI,gBAAgB,EAAE;YACpB,MAAM,YAAY,GAA6B;gBAC7C,EAAE,EAAE,OAAO;gBACX,cAAc;aACf,CAAC;YACF,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;SAC5C;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC,CAAC;SACD,IAAI,CAAC,QAAQ,CAAC,EAAE;QACf,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,gGAAgG;YAChG,MAAM,YAAY,GAA6B;gBAC7C,EAAE,EAAE,OAAO;gBACX,cAAc;aACf,CAAC;YACF,OAAO,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;SACzC;aAAM;YACL,iCAAiC;YACjC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,QAA8B,EAAE,EAAE;QACvC,2BAA2B;QAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,EAAE;QACV,4CAA4C;QAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { __read } from "tslib";
|
|
17
16
|
/**
|
|
18
17
|
* Provides a function for deleting a deployed Solution item and all of the items that were created
|
|
19
18
|
* as part of that deployment.
|
|
@@ -43,14 +42,14 @@ import * as reportProgress from "./reportProgress";
|
|
|
43
42
|
* deletion using the solutionItemId.
|
|
44
43
|
*/
|
|
45
44
|
export function deleteSolutionContents(solutionItemId, solutionSummary, authentication, options) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return new Promise(
|
|
53
|
-
|
|
45
|
+
const deleteOptions = options || {};
|
|
46
|
+
let progressPercentStep = 0;
|
|
47
|
+
let percentDone = 0;
|
|
48
|
+
let solutionDeletedSummary;
|
|
49
|
+
let solutionFailureSummary;
|
|
50
|
+
let solutionIds = [];
|
|
51
|
+
return new Promise(resolve => {
|
|
52
|
+
let removalPromise = Promise.resolve([
|
|
54
53
|
{
|
|
55
54
|
id: solutionSummary.id,
|
|
56
55
|
title: solutionSummary.title,
|
|
@@ -70,11 +69,11 @@ export function deleteSolutionContents(solutionItemId, solutionSummary, authenti
|
|
|
70
69
|
// Save a copy of the Solution item ids for the deleteSolutionFolder call because removeItems
|
|
71
70
|
// destroys the solutionSummary.items list
|
|
72
71
|
solutionIds = solutionSummary.items
|
|
73
|
-
.map(
|
|
72
|
+
.map(item => item.id)
|
|
74
73
|
.concat([solutionItemId]);
|
|
75
|
-
|
|
76
|
-
.filter(
|
|
77
|
-
.map(
|
|
74
|
+
const hubSiteItemIds = solutionSummary.items
|
|
75
|
+
.filter((item) => item.type === "Hub Site Application")
|
|
76
|
+
.map((item) => item.id);
|
|
78
77
|
// Delete the items
|
|
79
78
|
progressPercentStep = 100 / (solutionSummary.items.length + 2); // one extra for starting plus one extra for solution itself
|
|
80
79
|
reportProgress.reportProgress((percentDone += progressPercentStep), deleteOptions); // let the caller know that we've started
|
|
@@ -82,20 +81,19 @@ export function deleteSolutionContents(solutionItemId, solutionSummary, authenti
|
|
|
82
81
|
removalPromise = removeItems.removeItems(solutionSummary, hubSiteItemIds, authentication, percentDone, progressPercentStep, deleteOptions);
|
|
83
82
|
}
|
|
84
83
|
removalPromise
|
|
85
|
-
.then(
|
|
86
|
-
|
|
87
|
-
_a = __read(results, 2), solutionDeletedSummary = _a[0], solutionFailureSummary = _a[1];
|
|
84
|
+
.then((results) => {
|
|
85
|
+
[solutionDeletedSummary, solutionFailureSummary] = results;
|
|
88
86
|
// Attempt to delete groups; we won't be checking success
|
|
89
|
-
return new Promise(
|
|
87
|
+
return new Promise(resolve2 => {
|
|
90
88
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
91
89
|
deleteEmptyGroups
|
|
92
90
|
.deleteEmptyGroups(solutionSummary.groups, authentication)
|
|
93
|
-
.then(
|
|
91
|
+
.then(() => {
|
|
94
92
|
resolve2(results);
|
|
95
93
|
});
|
|
96
94
|
});
|
|
97
95
|
})
|
|
98
|
-
.then(
|
|
96
|
+
.then(() => {
|
|
99
97
|
// If there were no failed deletes, it's OK to delete Solution item
|
|
100
98
|
if (solutionFailureSummary.items.length === 0) {
|
|
101
99
|
return deleteSolutionItem.deleteSolutionItem(solutionItemId, authentication);
|
|
@@ -105,7 +103,7 @@ export function deleteSolutionContents(solutionItemId, solutionSummary, authenti
|
|
|
105
103
|
return Promise.resolve({ success: false, itemId: solutionItemId });
|
|
106
104
|
}
|
|
107
105
|
})
|
|
108
|
-
.then(
|
|
106
|
+
.then((solutionItemDeleteStatus) => {
|
|
109
107
|
// If all deletes succeeded, see if we can delete the folder that contained them
|
|
110
108
|
if (solutionItemDeleteStatus.success) {
|
|
111
109
|
reportProgress.reportProgress(99, deleteOptions, solutionItemId, EItemProgressStatus.Finished);
|
|
@@ -116,10 +114,10 @@ export function deleteSolutionContents(solutionItemId, solutionSummary, authenti
|
|
|
116
114
|
return Promise.resolve(false);
|
|
117
115
|
}
|
|
118
116
|
})
|
|
119
|
-
.then(
|
|
117
|
+
.then(() => {
|
|
120
118
|
resolve([solutionDeletedSummary, solutionFailureSummary]);
|
|
121
119
|
})
|
|
122
|
-
.catch(
|
|
120
|
+
.catch(() => {
|
|
123
121
|
resolve([solutionDeletedSummary, solutionFailureSummary]);
|
|
124
122
|
});
|
|
125
123
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteSolutionContents.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionContents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"deleteSolutionContents.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionContents.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,10 +28,10 @@ export function deleteSolutionFolder(solutionIds, folderId, authentication) {
|
|
|
28
28
|
// See if the deployment folder is empty and can be deleted; first, we need info about user
|
|
29
29
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
30
30
|
return authentication
|
|
31
|
-
.getUser({ authentication
|
|
32
|
-
.then(
|
|
31
|
+
.getUser({ authentication })
|
|
32
|
+
.then(user => {
|
|
33
33
|
// And then we need to be sure that the folder is empty
|
|
34
|
-
|
|
34
|
+
const query = new portal.SearchQueryBuilder()
|
|
35
35
|
.match(authentication.username)
|
|
36
36
|
.in("owner")
|
|
37
37
|
.and()
|
|
@@ -42,23 +42,23 @@ export function deleteSolutionFolder(solutionIds, folderId, authentication) {
|
|
|
42
42
|
.in("ownerfolder");
|
|
43
43
|
return portal.searchItems({
|
|
44
44
|
q: query,
|
|
45
|
-
authentication
|
|
45
|
+
authentication
|
|
46
46
|
});
|
|
47
47
|
})
|
|
48
|
-
.then(
|
|
48
|
+
.then((searchResult) => {
|
|
49
49
|
// If the search results are all in the deletedItemIds list, then we're dealing with AGO lagging:
|
|
50
50
|
// successfully reporting a deletion and yet still returning the item in search results.
|
|
51
51
|
// Filter the Solution items out of the search results.
|
|
52
|
-
|
|
53
|
-
.map(
|
|
54
|
-
.filter(
|
|
52
|
+
const nonSolutionItems = searchResult.results
|
|
53
|
+
.map(foundItem => foundItem.id)
|
|
54
|
+
.filter(foundItemId => !solutionIds.includes(foundItemId)); // only save non-solution items
|
|
55
55
|
// If the list is empty, then there are no non-solution items
|
|
56
56
|
if (nonSolutionItems.length === 0) {
|
|
57
57
|
// OK to delete the folder
|
|
58
58
|
return portal.removeFolder({
|
|
59
59
|
folderId: folderId,
|
|
60
60
|
owner: authentication.username,
|
|
61
|
-
authentication
|
|
61
|
+
authentication
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
@@ -66,7 +66,7 @@ export function deleteSolutionFolder(solutionIds, folderId, authentication) {
|
|
|
66
66
|
return Promise.resolve({ success: true });
|
|
67
67
|
}
|
|
68
68
|
})
|
|
69
|
-
.then(
|
|
69
|
+
.then(deleteFolderResponse => {
|
|
70
70
|
// Extract the success property
|
|
71
71
|
return deleteFolderResponse.success;
|
|
72
72
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteSolutionFolder.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionFolder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AAEnD,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,WAAqB,EACrB,QAAgB,EAChB,cAA2B;IAE3B,2FAA2F;IAC3F,mEAAmE;IACnE,OAAO,cAAc;SAClB,OAAO,CAAC,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"deleteSolutionFolder.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionFolder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AAEnD,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,WAAqB,EACrB,QAAgB,EAChB,cAA2B;IAE3B,2FAA2F;IAC3F,mEAAmE;IACnE,OAAO,cAAc;SAClB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;SAC3B,IAAI,CAAC,IAAI,CAAC,EAAE;QACX,uDAAuD;QACvD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,kBAAkB,EAAE;aAC1C,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC;aAC9B,EAAE,CAAC,OAAO,CAAC;aACX,GAAG,EAAE;aACL,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;aACjB,EAAE,CAAC,OAAO,CAAC;aACX,GAAG,EAAE;aACL,KAAK,CAAC,QAAQ,CAAC;aACf,EAAE,CAAC,aAAa,CAAC,CAAC;QAErB,OAAO,MAAM,CAAC,WAAW,CAAC;YACxB,CAAC,EAAE,KAAK;YACR,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,YAAgD,EAAE,EAAE;QACzD,iGAAiG;QACjG,wFAAwF;QACxF,uDAAuD;QACvD,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO;aAC1C,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;aAC9B,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,+BAA+B;QAE7F,6DAA6D;QAC7D,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,0BAA0B;YAC1B,OAAO,MAAM,CAAC,YAAY,CAAC;gBACzB,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,cAAc,CAAC,QAAQ;gBAC9B,cAAc;aACf,CAAC,CAAC;SACJ;aAAM;YACL,4DAA4D;YAC5D,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC,CAAC;SACD,IAAI,CAAC,oBAAoB,CAAC,EAAE;QAC3B,+BAA+B;QAC/B,OAAO,oBAAoB,CAAC,OAAO,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -25,13 +25,13 @@ import * as restHelpers from "../restHelpers";
|
|
|
25
25
|
* @return Promise that will resolve with the status of deleting the item
|
|
26
26
|
*/
|
|
27
27
|
export function deleteSolutionItem(solutionItemId, authentication) {
|
|
28
|
-
|
|
28
|
+
const protectOptions = {
|
|
29
29
|
id: solutionItemId,
|
|
30
|
-
authentication
|
|
30
|
+
authentication
|
|
31
31
|
};
|
|
32
32
|
return portal
|
|
33
33
|
.unprotectItem(protectOptions)
|
|
34
|
-
.then(
|
|
34
|
+
.then(result => {
|
|
35
35
|
if (result.success) {
|
|
36
36
|
return restHelpers.removeItem(solutionItemId, authentication);
|
|
37
37
|
}
|
|
@@ -39,7 +39,7 @@ export function deleteSolutionItem(solutionItemId, authentication) {
|
|
|
39
39
|
return Promise.resolve(result);
|
|
40
40
|
}
|
|
41
41
|
})
|
|
42
|
-
.then(
|
|
42
|
+
.then(result => {
|
|
43
43
|
return Promise.resolve({
|
|
44
44
|
success: result.success,
|
|
45
45
|
itemId: solutionItemId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteSolutionItem.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAE9C,wHAAwH;AAExH;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,cAAsB,EACtB,cAA2B;IAE3B,
|
|
1
|
+
{"version":3,"file":"deleteSolutionItem.js","sourceRoot":"","sources":["../../../src/deleteHelpers/deleteSolutionItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAE9C,wHAAwH;AAExH;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,cAAsB,EACtB,cAA2B;IAE3B,MAAM,cAAc,GAA4B;QAC9C,EAAE,EAAE,cAAc;QAClB,cAAc;KACf,CAAC;IACF,OAAO,MAAM;SACV,aAAa,CAAC,cAAc,CAAC;SAC7B,IAAI,CAAC,MAAM,CAAC,EAAE;QACb,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SAC/D;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAChC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,EAAE;QACb,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -23,7 +23,7 @@ import * as dependencies from "../dependencies";
|
|
|
23
23
|
* as the build order used to create the template Solution
|
|
24
24
|
*/
|
|
25
25
|
export function reconstructBuildOrderIds(templates) {
|
|
26
|
-
|
|
26
|
+
const buildOrdering = dependencies.topologicallySortItems(templates);
|
|
27
27
|
return buildOrdering.buildOrder;
|
|
28
28
|
}
|
|
29
29
|
//# sourceMappingURL=reconstructBuildOrderIds.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconstructBuildOrderIds.js","sourceRoot":"","sources":["../../../src/deleteHelpers/reconstructBuildOrderIds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAEhD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAA0B;IACjE,
|
|
1
|
+
{"version":3,"file":"reconstructBuildOrderIds.js","sourceRoot":"","sources":["../../../src/deleteHelpers/reconstructBuildOrderIds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAEhD,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAA0B;IACjE,MAAM,aAAa,GAAmB,YAAY,CAAC,sBAAsB,CACvE,SAAS,CACV,CAAC;IACF,OAAO,aAAa,CAAC,UAAU,CAAC;AAClC,CAAC"}
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { __awaiter, __generator, __read } from "tslib";
|
|
17
16
|
/**
|
|
18
17
|
* @module removeItems
|
|
19
18
|
*/
|
|
@@ -38,49 +37,41 @@ import { createHubRequestOptions } from "../create-hub-request-options";
|
|
|
38
37
|
* @return Promise that will resolve with a list of two solution summaries: successful deletions
|
|
39
38
|
* and failed deletions. Ignored items (e.g., already deleted) will not be in either list.
|
|
40
39
|
*/
|
|
41
|
-
export function removeItems(solutionSummary, hubSiteItemIds, authentication, percentDone, progressPercentStep, deleteOptions) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
var itemToDelete = solutionSummary.items.shift();
|
|
47
|
-
var percentDoneReport = percentDone + progressPercentStep * (solutionSummary.items.length + 1);
|
|
40
|
+
export function removeItems(solutionSummary, hubSiteItemIds, authentication, percentDone, progressPercentStep, deleteOptions = {}) {
|
|
41
|
+
let solutionDeletedSummary;
|
|
42
|
+
let solutionFailureSummary;
|
|
43
|
+
const itemToDelete = solutionSummary.items.shift();
|
|
44
|
+
const percentDoneReport = percentDone + progressPercentStep * (solutionSummary.items.length + 1);
|
|
48
45
|
if (itemToDelete) {
|
|
49
46
|
// On to next item in list
|
|
50
47
|
return removeItems(solutionSummary, hubSiteItemIds, authentication, percentDone, progressPercentStep, deleteOptions)
|
|
51
|
-
.then(
|
|
52
|
-
var _a;
|
|
48
|
+
.then((results) => {
|
|
53
49
|
// Done with subsequent items in list; now delete the current item
|
|
54
|
-
|
|
50
|
+
[solutionDeletedSummary, solutionFailureSummary] = results;
|
|
55
51
|
// Remove any delete protection on item
|
|
56
52
|
return portal.unprotectItem({
|
|
57
53
|
id: itemToDelete.id,
|
|
58
54
|
authentication: authentication
|
|
59
55
|
});
|
|
60
56
|
})
|
|
61
|
-
.then(
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
});
|
|
74
|
-
}); })
|
|
75
|
-
.then(function () {
|
|
57
|
+
.then(async () => {
|
|
58
|
+
// Delete the item
|
|
59
|
+
if (hubSiteItemIds.includes(itemToDelete.id)) {
|
|
60
|
+
const options = await createHubRequestOptions(authentication);
|
|
61
|
+
return hubSites.removeSite(itemToDelete.id, options);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
return restHelpers.removeItem(itemToDelete.id, authentication);
|
|
65
|
+
}
|
|
66
|
+
})
|
|
67
|
+
.then(() => {
|
|
76
68
|
// Successful deletion
|
|
77
69
|
solutionDeletedSummary.items.push(itemToDelete);
|
|
78
70
|
reportProgress.reportProgress(percentDoneReport, deleteOptions, itemToDelete.id, EItemProgressStatus.Finished);
|
|
79
71
|
return [solutionDeletedSummary, solutionFailureSummary];
|
|
80
72
|
})
|
|
81
|
-
.catch(
|
|
82
|
-
|
|
83
|
-
var errorMessage = ((_a = error.error) === null || _a === void 0 ? void 0 : _a.message) || error.message;
|
|
73
|
+
.catch(error => {
|
|
74
|
+
const errorMessage = error.error?.message || error.message;
|
|
84
75
|
if (errorMessage &&
|
|
85
76
|
errorMessage.includes("Item does not exist or is inaccessible")) {
|
|
86
77
|
// Filter out errors where the item doesn't exist, such as from a previous delete attempt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeItems.js","sourceRoot":"","sources":["../../../src/deleteHelpers/removeItems.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"removeItems.js","sourceRoot":"","sources":["../../../src/deleteHelpers/removeItems.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,11 +25,8 @@ import { EItemProgressStatus, SItemProgressStatus } from "../interfaces";
|
|
|
25
25
|
* @param deleteOptions Reporting options
|
|
26
26
|
* @param deletedItemId Id of item deleted
|
|
27
27
|
*/
|
|
28
|
-
export function reportProgress(percentDone, deleteOptions, deletedItemId, status) {
|
|
29
|
-
|
|
30
|
-
if (deletedItemId === void 0) { deletedItemId = ""; }
|
|
31
|
-
if (status === void 0) { status = EItemProgressStatus.Started; }
|
|
32
|
-
var iPercentDone = Math.round(percentDone);
|
|
28
|
+
export function reportProgress(percentDone, deleteOptions, deletedItemId = "", status = EItemProgressStatus.Started) {
|
|
29
|
+
const iPercentDone = Math.round(percentDone);
|
|
33
30
|
/* istanbul ignore else */
|
|
34
31
|
if (deleteOptions.progressCallback) {
|
|
35
32
|
deleteOptions.progressCallback(iPercentDone, deleteOptions.jobId, {
|
|
@@ -39,7 +36,7 @@ export function reportProgress(percentDone, deleteOptions, deletedItemId, status
|
|
|
39
36
|
}
|
|
40
37
|
/* istanbul ignore else */
|
|
41
38
|
if (deleteOptions.consoleProgress) {
|
|
42
|
-
console.log(Date.now(), deletedItemId,
|
|
39
|
+
console.log(Date.now(), deletedItemId, deleteOptions.jobId ?? "", SItemProgressStatus[status], iPercentDone + "%");
|
|
43
40
|
}
|
|
44
41
|
}
|
|
45
42
|
//# sourceMappingURL=reportProgress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../../src/deleteHelpers/reportProgress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AAEH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EAEpB,MAAM,eAAe,CAAC;AAEvB,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,WAAmB,EACnB,aAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../../src/deleteHelpers/reportProgress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;GAEG;AAEH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EAEpB,MAAM,eAAe,CAAC;AAEvB,wHAAwH;AAExH;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,WAAmB,EACnB,aAAqC,EACrC,aAAa,GAAG,EAAE,EAClB,MAAM,GAAG,mBAAmB,CAAC,OAAO;IAEpC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE7C,0BAA0B;IAC1B,IAAI,aAAa,CAAC,gBAAgB,EAAE;QAClC,aAAa,CAAC,gBAAgB,CAAC,YAAY,EAAE,aAAa,CAAC,KAAK,EAAE;YAChE,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,aAAa;SACpB,CAAC,CAAC;KACJ;IAED,0BAA0B;IAC1B,IAAI,aAAa,CAAC,eAAe,EAAE;QACjC,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,GAAG,EAAE,EACV,aAAa,EACb,aAAa,CAAC,KAAK,IAAI,EAAE,EACzB,mBAAmB,CAAC,MAAM,CAAC,EAC3B,YAAY,GAAG,GAAG,CACnB,CAAC;KACH;AACH,CAAC"}
|