@esri/solution-common 1.1.2 → 1.2.0

package/dist/node/velocityHelpers.js

@@ -15,9 +15,22 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._replaceVelocityUrls = exports.updateVelocityReferences = exports.getVelocityUrlBase = void 0;
-var get_subscription_info_1 = require("./get-subscription-info");
-var generalHelpers_1 = require("./generalHelpers");
+exports._replaceVelocityUrls = exports.updateVelocityReferences = exports.getVelocityUrlBase = exports.PROP_NAMES = exports.BASE_NAMES = void 0;
+const get_subscription_info_1 = require("./get-subscription-info");
+const generalHelpers_1 = require("./generalHelpers");
+// Known base names if output, source, or feed name is missing
+exports.BASE_NAMES = [
+    "feat-lyr-new",
+    "feat-lyr-existing",
+    "stream-lyr-new"
+];
+// Known prop paths that can contain item Ids
+exports.PROP_NAMES = [
+    ".portal.mapServicePortalItemID",
+    ".portal.featureServicePortalItemID",
+    ".portal.streamServicePortalItemID",
+    ".portalItemId"
+];
 /**
  * Get the base velocity url from the current orgs subscription info
  *
@@ -38,12 +51,12 @@ function getVelocityUrlBase(authentication, templateDictionary) {
     }
     else {
         // get the url from the orgs subscription info
-        return (0, get_subscription_info_1.getSubscriptionInfo)({ authentication: authentication }).then(function (subscriptionInfo) {
-            var velocityUrl = "";
-            var orgCapabilities = (0, generalHelpers_1.getProp)(subscriptionInfo, "orgCapabilities");
+        return (0, get_subscription_info_1.getSubscriptionInfo)({ authentication }).then((subscriptionInfo) => {
+            let velocityUrl = "";
+            const orgCapabilities = (0, generalHelpers_1.getProp)(subscriptionInfo, "orgCapabilities");
             /* istanbul ignore else */
             if (Array.isArray(orgCapabilities)) {
-                orgCapabilities.some(function (c) {
+                orgCapabilities.some(c => {
                     /* istanbul ignore else */
                     if (c.id === "velocity" && c.status === "active" && c.velocityUrl) {
                         velocityUrl = c.velocityUrl;
@@ -72,9 +85,10 @@ exports.getVelocityUrlBase = getVelocityUrlBase;
  *
  */
 function updateVelocityReferences(data, type, templateDictionary) {
-    var velocityUrl = templateDictionary.velocityUrl;
+    const velocityUrl = templateDictionary.velocityUrl;
     if (data && type === "Web Map" && velocityUrl) {
-        (data.operationalLayers || []).forEach(function (l) {
+        const layersAndTables = (data.operationalLayers || []).concat(data.tables || []);
+        (layersAndTables).forEach((l) => {
             if (l.url && l.url.indexOf(velocityUrl) > -1 && l.itemId) {
                 delete l.itemId;
             }
@@ -94,17 +108,21 @@ exports.updateVelocityReferences = updateVelocityReferences;
  *
  */
 function _replaceVelocityUrls(data, velocityUrl) {
-    var dataString = JSON.stringify(data);
+    let dataString = JSON.stringify(data);
     if (dataString.indexOf(velocityUrl) > -1) {
         // replace any instance of the velocity base url
-        dataString = dataString.replace(new RegExp("" + velocityUrl, "gi"), "{{velocityUrl}}");
+        dataString = dataString.replace(new RegExp(`${velocityUrl}`, "gi"), "{{velocityUrl}}");
         // add solutionItemId to any velocity service names
-        var regex = new RegExp("{{velocityUrl}}.+?(?=/[A-Za-z]+Server)", "gi");
-        var results = regex.exec(dataString);
+        const regex = new RegExp("{{velocityUrl}}.+?(?=/[A-Za-z]+Server)", "gi");
+        const results = dataString.match(regex);
         /* istanbul ignore else */
         if (results) {
-            results.forEach(function (result) {
-                dataString = dataString.replace(new RegExp(result, "g"), result + "_{{solutionItemId}}");
+            const uniqueResults = results.filter((v, i, self) => self.indexOf(v) === i);
+            uniqueResults.forEach(result => {
+                // these names can contain reserved characters for regex
+                // for example: http://something/name(something else)
+                // TypeScript for es2015 doesn't have a definition for `replaceAll`
+                dataString = dataString.replaceAll(result, `${result}_{{solutionItemId}}`);
             });
         }
         return JSON.parse(dataString);

package/dist/node/velocityHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"velocityHelpers.js","sourceRoot":"","sources":["../../src/velocityHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"velocityHelpers.js","sourceRoot":"","sources":["../../src/velocityHelpers.ts"],"names":[],"mappings":"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"}

package/dist/node/workforceHelpers.d.ts

@@ -49,6 +49,17 @@ export declare function templatizeWorkforce(data: any, keyProperties: string[],
  */
 export declare function getWorkforceDependencies(itemTemplate: IItemTemplate, dependencies: any[]): any;
 export declare function getWorkforceServiceInfo(properties: IFeatureServiceProperties, url: string, authentication: UserSession): Promise<IFeatureServiceProperties>;
+/**
+ * Wrap global id and assignmenttype values in curly braces
+ *
+ * Added for issue #734
+ *
+ * This function will update the provided workforceInfos object
+ *
+ * @param workforceInfos the object that stores the integration and type info with global ids
+ *
+ */
+export declare function _updateGlobalIdAndAssignmentType(workforceInfos: any): void;
 export declare function _getAssignmentTypeInfos(assignmentTypes: any): any[];
 export declare function _getAssignmentIntegrationInfos(assignmentIntegrations: any, authentication: UserSession): Promise<any>;
 export declare function getUrlDependencies(requests: Array<Promise<any>>, urls: string[]): Promise<any>;