@esri/solution-deployer 1.5.2 → 1.6.0

package/dist/umd/deployer.umd.js

@@ -1,7 +1,7 @@
 /* @preserve
-* @esri/solution-deployer - v1.5.2 - Apache-2.0
+* @esri/solution-deployer - v1.6.0 - Apache-2.0
 * Copyright (c) 2018-2022 Esri, Inc.
-* Wed Oct 19 2022 09:20:49 GMT-0700 (Pacific Daylight Time)
+* Thu Nov 10 2022 06:36:47 GMT-0800 (Pacific Standard Time)
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -515,11 +515,15 @@
   function _reuseDeployedItems(templates, reuseItems, templateDictionary, authentication) {
       return new Promise((resolve, reject) => {
           if (reuseItems) {
-              const existingItemsByKeyword = _findExistingItemByKeyword(templates, templateDictionary, authentication);
+              const findItemsByKeywordResponse = _findExistingItemByKeyword(templates, templateDictionary, authentication);
+              const existingItemsByKeyword = findItemsByKeywordResponse.existingItemsDefs;
+              const existingItemInfos = findItemsByKeywordResponse.existingItemInfos;
               Promise.all(existingItemsByKeyword).then((existingItemsByKeywordResponse) => {
-                  const existingItemsByTag = _handleExistingItems(existingItemsByKeywordResponse, templateDictionary, authentication, true);
+                  const findExistingItemsByTag = _handleExistingItems(existingItemsByKeywordResponse, existingItemInfos, templateDictionary, authentication, true);
+                  const existingItemsByTag = findExistingItemsByTag.existingItemsDefs;
+                  const existingItemInfosByTag = findExistingItemsByTag.existingItemInfos;
                   Promise.all(existingItemsByTag).then(existingItemsByTagResponse => {
-                      _handleExistingItems(existingItemsByTagResponse, templateDictionary, authentication, false);
+                      _handleExistingItems(existingItemsByTagResponse, existingItemInfosByTag, templateDictionary, authentication, false);
                       // eslint-disable-next-line @typescript-eslint/no-floating-promises
                       _updateTemplateDictionary(templates, templateDictionary, authentication).then(resolve);
                   }, e => reject(common__namespace.fail(e)));
@@ -802,18 +806,21 @@
    * Optionally search by tags and then update the templateDictionary based on the search results
    *
    * @param existingItemsResponse response object from search by typeKeyword and type
+   * @param existingItemIds list of the template ids we have queried
    * @param templateDictionary Hash of facts: org URL, adlib replacements, deferreds for dependencies
    * @param authentication Credentials for the request
    * @param addTagQuery Boolean to indicate if a search by tag should happen
-   * @returns A promise that will resolve with an array of results
+   * @returns IFindExistingItemsResponse object with  promise that will resolve with an array of results
+   * and an array of item ids
    * @private
    */
-  function _handleExistingItems(existingItemsResponse, templateDictionary, authentication, addTagQuery) {
+  function _handleExistingItems(existingItemsResponse, existingItemInfos, templateDictionary, authentication, addTagQuery) {
       // if items are not found by type keyword search by tag
       const existingItemsByTag = [Promise.resolve(null)];
+      const existingItemInfosByTag = [undefined];
       /* istanbul ignore else */
       if (existingItemsResponse && Array.isArray(existingItemsResponse)) {
-          existingItemsResponse.forEach(existingItem => {
+          existingItemsResponse.forEach((existingItem, i) => {
               /* istanbul ignore else */
               if (Array.isArray(existingItem?.results)) {
                   let result;
@@ -825,15 +832,15 @@
                       result = results.reduce((a, b) => a.created > b.created ? a : b);
                   }
                   else {
-                      if (addTagQuery && existingItem.query) {
-                          const tagQuery = existingItem.query.replace("typekeywords", "tags");
+                      if (addTagQuery && existingItemInfos[i]) {
+                          const itemInfo = existingItemInfos[i];
+                          const tagQuery = `tags:source-${itemInfo.itemId} type:${itemInfo.type} owner:${templateDictionary.user.username}`;
                           existingItemsByTag.push(_findExistingItem(tagQuery, authentication));
+                          existingItemInfosByTag.push(existingItemInfos[i]);
                       }
                   }
                   if (result) {
-                      const sourceId = existingItem.query
-                          ? existingItem.query.match(/[0-9A-F]{32}/i)[0]
-                          : existingItem.sourceId;
+                      const sourceId = existingItemInfos[i].itemId;
                       /* istanbul ignore else */
                       if (sourceId) {
                           _updateTemplateDictionaryById(templateDictionary, sourceId, result.id, result);
@@ -842,7 +849,10 @@
               }
           });
       }
-      return existingItemsByTag;
+      return {
+          existingItemsDefs: existingItemsByTag,
+          existingItemInfos: existingItemInfosByTag
+      };
   }
   //???
   function _updateTemplateDictionaryById(templateDictionary, sourceId, itemId, v) {
@@ -857,13 +867,16 @@
   /**
    * Search items based on user query
    *
-   * @param query Query string to use
+   * @param templates Templates to examine
+   * @param templateDictionary Hash of facts: org URL, adlib replacements, deferreds for dependencies
    * @param authentication Credentials for the request
-   * @returns A promise that will resolve with an array of results
+   * @returns IFindExistingItemsResponse object with  promise that will resolve with an array of results
+   * and an array of item ids
    * @private
    */
   function _findExistingItemByKeyword(templates, templateDictionary, authentication) {
       const existingItemsDefs = [];
+      const existingItemInfos = [];
       templates.forEach(template => {
           if (template.item.type === "Group") {
               const userGroups = templateDictionary.user?.groups;
@@ -883,8 +896,15 @@
           else {
               existingItemsDefs.push(_findExistingItem(`typekeywords:source-${template.itemId} type:${template.item.type} owner:${templateDictionary.user.username}`, authentication));
           }
+          existingItemInfos.push({
+              itemId: template.itemId,
+              type: template.item.type
+          });
       });
-      return existingItemsDefs;
+      return {
+          existingItemsDefs,
+          existingItemInfos
+      };
   }
   /**
    * Search items based on user query