Merge pull request #131 from vlocityinc/fix

Fix manifest not accepting the folder name for export / deploy.

Author: Adam Rutland

lib/datapacksbuilder.js

@@ -351,21 +351,22 @@ DataPacksBuilder.prototype.isInManifest = function(jobInfo, dataPackType, dataPa
     }
 
     if (jobInfo.specificManifestKeys && 
-        jobInfo.specificManifestKeys.indexOf(dataPackKey) != -1) {
+        (jobInfo.specificManifestKeys.indexOf(dataPackKey) != -1
+        || jobInfo.specificManifestKeys.indexOf(this.vlocity.datapacksexpand.sanitizeDataPackKey(dataPackKey)) != -1)) {
         jobInfo.manifestFound[dataPackKey] = true; 
+        jobInfo.manifestFound[this.vlocity.datapacksexpand.sanitizeDataPackKey(dataPackKey)] = true;
         return true; 
     }
 
     // Allow Passing in Just Type to Manifest for Deploy
-    if (jobInfo.specificManifestKeys && 
-        jobInfo.specificManifestKeys.indexOf(dataPackType) != -1) {
+    if (jobInfo.specificManifestKeys && jobInfo.specificManifestKeys.indexOf(dataPackType) != -1) {
         jobInfo.manifestFound[dataPackKey] = true; 
         return true; 
     }
 
     if (jobInfo.specificManifestObjects && 
         jobInfo.specificManifestObjects[dataPackType] && 
-        jobInfo.specificManifestObjects[dataPackType].indexOf(dataPackName) != -1 ) {
+        jobInfo.specificManifestObjects[dataPackType].indexOf(dataPackName) != -1) {
         jobInfo.manifestFound[dataPackKey] = true; 
         return true; 
     }
@@ -446,7 +447,9 @@ DataPacksBuilder.prototype.initializeImportStatus = function(importPath, jobInfo
 
         jobInfo.specificManifestKeys.forEach(function(key) {
             // Ignore when passed in as type
-            if (key.indexOf('/') != -1 && !jobInfo.manifestFound[key]) {
+            if (key.indexOf('/') != -1 
+            && !(jobInfo.manifestFound[key] 
+                || jobInfo.manifestFound[self.vlocity.datapacksexpand.sanitizeDataPackKey(key)])) {
                 jobInfo.hasError = true;
                 jobInfo.errors.push('Manifest Item Missing >> ' + key);
                 VlocityUtils.error('Manifest Item Missing', key);

lib/datapacksjob.js

@@ -598,7 +598,11 @@ DataPacksJob.prototype.buildManifestFromQueries = function(jobInfo, onComplete)
 
 
                     if (!jobInfo.fullManifest[queryData.VlocityDataPackType][record.Id]) {
-                        if (jobInfo.specificManifestKeys && jobInfo.specificManifestKeys.indexOf(queryData.VlocityDataPackType) == -1 && jobInfo.specificManifestKeys.indexOf(record.VlocityDataPackKeyForManifest) == -1 && jobInfo.specificManifestKeys.indexOf(record.Id) == -1) {
+                        if (jobInfo.specificManifestKeys 
+                            && jobInfo.specificManifestKeys.indexOf(queryData.VlocityDataPackType) == -1 
+                            && jobInfo.specificManifestKeys.indexOf(record.VlocityDataPackKeyForManifest) == -1 
+                            && jobInfo.specificManifestKeys.indexOf(self.vlocity.datapacksexpand.sanitizeDataPackKey(record.VlocityDataPackKeyForManifest)) == -1 
+                            && jobInfo.specificManifestKeys.indexOf(record.Id) == -1) {
                             return;
                         }