@esri/solution-velocity 1.1.2 → 1.2.0

package/dist/esm/helpers/get-velocity-dependencies.d.ts

@@ -51,4 +51,4 @@ export declare function _getFeedDependencies(feeds: any[], dependencies: string[
  * @param dependencies The current list of dependencies
  * @param prop The individual prop to evaluate
  */
-export declare function _getDependencies(outputs: any[], dependencies: string[], prop: string): void;
+export declare function _getDependencies(outputs: any[], dependencies: string[]): void;

package/dist/esm/helpers/get-velocity-dependencies.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getProp, getItemBase } from "@esri/solution-common";
+import { getProp, getItemBase, BASE_NAMES, PROP_NAMES } from "@esri/solution-common";
 /**
  * Get the dependencies from the velocity data sources, feeds, and outputs.
  * Only dependencies that do NOT have the typeKeyword "IoTFeatureLayer" are returned.
@@ -24,11 +24,17 @@ import { getProp, getItemBase } from "@esri/solution-common";
  * @return a list of dependency ids
  */
 export function getVelocityDependencies(template, authentication) {
-    var dependencies = [];
-    _getDependencies(getProp(template, "data.sources") ? template.data.sources : [], dependencies, "feature-layer.portalItemId");
-    _getFeedDependencies(getProp(template, "data.feeds") ? template.data.feeds : [], dependencies);
-    _getDependencies(getProp(template, "data.outputs") ? template.data.outputs : [], dependencies, "feat-lyr-new.portal.featureServicePortalItemID");
-    _getDependencies(getProp(template, "data.outputs") ? template.data.outputs : [], dependencies, "feat-lyr-new.portal.mapServicePortalItemID");
+    const dependencies = [];
+    [
+        getProp(template, "data.feeds") ? template.data.feeds : [],
+        getProp(template, "data.feed") ? [template.data.feed] : []
+    ].forEach(f => _getFeedDependencies(f, dependencies));
+    [
+        getProp(template, "data.sources") ? template.data.sources : [],
+        getProp(template, "data.source") ? [template.data.source] : [],
+        getProp(template, "data.outputs") ? template.data.outputs : [],
+        getProp(template, "data.output") ? [template.data.output] : []
+    ].forEach(d => _getDependencies(d, dependencies));
     return _validateDependencies(dependencies, authentication);
 }
 /**
@@ -42,11 +48,11 @@ export function getVelocityDependencies(template, authentication) {
  * @return a list of dependency ids
  */
 export function _validateDependencies(dependencies, authentication) {
-    var defs = dependencies.map(function (d) {
+    const defs = dependencies.map(d => {
         return getItemBase(d, authentication);
     });
-    return Promise.all(defs).then(function (itemInfos) {
-        return Promise.resolve(itemInfos.reduce(function (prev, cur) {
+    return Promise.all(defs).then(itemInfos => {
+        return Promise.resolve(itemInfos.reduce((prev, cur) => {
             if (cur.typeKeywords.indexOf("IoTFeatureLayer") < 0) {
                 prev.push(cur.id);
             }
@@ -62,14 +68,18 @@ export function _validateDependencies(dependencies, authentication) {
  * @param dependencies The current list of dependencies
  */
 export function _getFeedDependencies(feeds, dependencies) {
-    feeds.reduce(function (prev, cur) {
-        var id = cur.id || undefined;
+    feeds.reduce((prev, cur) => {
+        const id = cur.id || undefined;
         /* istanbul ignore else */
         if (id && prev.indexOf(id) < 0) {
             prev.push(id);
         }
         return prev;
     }, dependencies);
+    // run through standard dependency check as well
+    // in some cases the feed does not have the id property but will have
+    // a portalItemId value in the properties
+    _getDependencies(feeds, dependencies);
 }
 /**
  * Get the dependencies from the velocity outputs or dataSources.
@@ -79,12 +89,21 @@ export function _getFeedDependencies(feeds, dependencies) {
  * @param dependencies The current list of dependencies
  * @param prop The individual prop to evaluate
  */
-export function _getDependencies(outputs, dependencies, prop) {
-    outputs.reduce(function (prev, cur) {
-        var id = cur.properties ? cur.properties[prop] : undefined;
-        if (id && prev.indexOf(id) < 0) {
-            prev.push(id);
-        }
+export function _getDependencies(outputs, dependencies) {
+    outputs.reduce((prev, cur) => {
+        const names = getProp(cur, "name") ? [cur.name] : BASE_NAMES;
+        names.forEach(n => {
+            PROP_NAMES.forEach(p => {
+                // skip map service and stream service ids
+                /* istanbul ignore else */
+                if (p.indexOf("mapServicePortalItemID") < 0 && p.indexOf("streamServicePortalItemID") < 0) {
+                    const id = cur.properties ? cur.properties[n + p] : undefined;
+                    if (id && prev.indexOf(id) < 0) {
+                        prev.push(id);
+                    }
+                }
+            });
+        });
         return prev;
     }, dependencies);
 }

package/dist/esm/helpers/get-velocity-dependencies.js.map

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

package/dist/esm/helpers/velocity-helpers.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IItemTemplate, UserSession } from "@esri/solution-common";
+import { IItemTemplate, IVelocityTitle, UserSession } from "@esri/solution-common";
 /**
  * Common function to build urls for reading and interacting with the velocity api
  *
@@ -54,7 +54,7 @@ export declare function postVelocityData(authentication: UserSession, template:
  * @return a promise that will resolve a unique title
  *
  */
-export declare function getTitle(authentication: UserSession, label: string, url: string): Promise<string>;
+export declare function getTitle(authentication: UserSession, label: string, url: string): Promise<IVelocityTitle>;
 /**
  * Validate the data that will be used and handle any reported issues with the outputs.
  * The output names must be unique across the organization.
@@ -65,12 +65,32 @@ export declare function getTitle(authentication: UserSession, label: string, url
  * @param templateDictionary Hash of facts: folder id, org URL, adlib replacements
  * @param type The type of velocity item
  * @param data The data used to construct the velocity item
- * @param dataOutputs The velocity items output objects.
+ * @param titles The list of know titles that exist in the org
+ * @param dataOutputs The velocity items output objects
+ * @param feeds The velocity items feed objects
  *
  * @return a promise that will resolve the data object passed in with any necessary changes.
  *
  */
-export declare function _validateOutputs(authentication: UserSession, templateDictionary: any, type: string, data: any, dataOutputs: any[]): Promise<any>;
+export declare function _validateOutputs(authentication: UserSession, templateDictionary: any, type: string, data: any, titles: any[], dataOutputs?: any[], feeds?: any[]): Promise<any>;
+/**
+ * Check the validate results for any name conflicts and store the conflicting names.
+ *
+ * @param validateResults The results object to check for name conflict errors
+ *
+ * @return a list of names that already exist in the org
+ *
+ */
+export declare function _validateMessages(validateResults: any): string[];
+/**
+ * Updates the feed object with a new name when validation fails.
+ *
+ * @param feeds The feed objects from the velocity item.
+ * @param data The full data object used for deploying the velocity item.
+ * @param names The names that failed due to duplicate error in validation.
+ *
+ */
+export declare function _updateFeed(feeds: any[], data: any, names: string[]): void;
 /**
  * Updates the data object with a new name when validation fails.
  *
@@ -178,7 +198,7 @@ body?: any): Promise<any>;
  * @param template The template that for the velocity item
  *
  */
-export declare function cleanDataSourcesAndFeeds(template: IItemTemplate): void;
+export declare function cleanDataSourcesAndFeeds(template: IItemTemplate, velocityUrl: string): void;
 /**
  * Remove key properties from the input source or feed
  *
@@ -186,7 +206,7 @@ export declare function cleanDataSourcesAndFeeds(template: IItemTemplate): void;
  * @param dependencies The list of dependencies
  *
  */
-export declare function _removeIdProps(sourcesOrFeeds: any[], dependencies: string[]): void;
+export declare function _removeIdProps(sourcesOrFeeds: any[], dependencies: string[], velocityUrl: string): void;
 /**
  * Remove key properties from the outputs.
  *