Alpha to beta

.gitignore

@@ -15,6 +15,7 @@ testJobRunning/testBuildFile.*
 .nyc_output/
 .vscode/
 .sfdx/
+.sf/
 .npmrc
 bin/vlocity*
 VlocityBuildLog.yaml

Dockerfile

@@ -1,11 +1,11 @@
-FROM node:16
+FROM node:18
 RUN dpkg --add-architecture i386
 
 RUN apt-get update
 RUN apt-get install -y jq
 RUN apt-get install -y libc6:i386 libstdc++6:i386
 
-RUN npm install --global [email protected]
+RUN npm install --global @salesforce/cli
 RUN npm install --global publish-release 
 
 RUN npm install --global pkg-fetch

README.md

@@ -132,7 +132,7 @@ Download and Install Node at:
 
 https://nodejs.org/
 
-This tool requires Node Version 10+.
+This tool requires Node Version 18+.
 
 Use `node -v` to find out which version you are on.
 

apex/TestDeployedDRsVIPs.cls

@@ -15,13 +15,13 @@ if (accts.size() > 0) {
     upsert(new Account(Name = 'VBT_TestAutomation3'));
 }
 
-vlocity_namespace.DRProcessResult result = vlocity_namespace.DRGlobal.processObjectsJSON('{"Name":"TestAuto"}', 'datapacktest_Extract');
+vlocity_namespace.DRProcessResult result = vlocity_namespace.DRGlobal.processObjectsJSON('{"Name":"TestAuto"}', 'datapacktestExtract');
 List < Object > outputDr1 = (List < Object >)result.convertToMap().get('returnResultsData');
 System.assertEquals(outputDr1.size(), 2);
 System.assert(JSON.serialize(outputDr1[0]).contains('VBT_TestAutomation1'));
 System.assert(JSON.serialize(outputDr1[1]).contains('VBT_TestAutomation2'));
 
-result = vlocity_namespace.DRGlobal.processObjectsJSON('{"Name":"TestAuto"}', 'datapacktest_Turbo');
+result = vlocity_namespace.DRGlobal.processObjectsJSON('{"Name":"TestAuto"}', 'datapacktestTurbo');
 String outputDrTurbo = JSON.serialize(result.convertToMap());
 System.assert(outputDrTurbo.contains('VBT TestAutomation'));
 System.assert(outputDrTurbo.contains(Acct1Id));

codeship/test.sh

@@ -3,12 +3,13 @@ set -e
 
 ./codeship/decryptFiles.sh
 
-sfdx
+sf
 
-SF_AUTH_ORG=`sfdx force:auth:sfdxurl:store -f codeship/unencrypted_files/test.sfdx --json`
+SF_AUTH_ORG=`sf org login sfdx-url --sfdx-url-file codeship/unencrypted_files/test.json --json`
 SF_USERNAME=`echo $SF_AUTH_ORG | jq -r '. | .result.username'`
 
-sfdx force:alias:set VB_TEST_ORG=$SF_USERNAME
+
+sf alias set VB_TEST_ORG=$SF_USERNAME
 
 npm run-script unitTest
 

javascript/updateAdminProfile.js

@@ -19,7 +19,7 @@ jsForceConnection.login(username, password, function(err, res) {
 
         var metadataUpdated = { 
             "fullName": "Admin", 
-            "fieldPermissions": metadata.fieldPermissions,
+            "fieldPermissions": metadata[0].fieldPermissions,
             "tabVisibilities": [],
             "recordTypeVisibilities": []
         };
@@ -29,7 +29,7 @@ jsForceConnection.login(username, password, function(err, res) {
             field.readable = "true";
         });
 
-        metadata.tabVisibilities.forEach(function(tab) {
+        metadata[0].tabVisibilities.forEach(function(tab) {
             if (tab.tab.indexOf('__') != -1) {
                 tab.visibility = "DefaultOn";
                 metadataUpdated.tabVisibilities.push(tab);
@@ -38,7 +38,7 @@ jsForceConnection.login(username, password, function(err, res) {
 
         var hasDefault = {};
 
-        metadata.recordTypeVisibilities.forEach(function(recordType) {
+        metadata[0].recordTypeVisibilities.forEach(function(recordType) {
 
             var type = recordType.recordType.substring(0, recordType.recordType.indexOf('.'));
 
@@ -47,7 +47,7 @@ jsForceConnection.login(username, password, function(err, res) {
             }
         });
 
-        metadata.recordTypeVisibilities.forEach(function(recordType) {
+        metadata[0].recordTypeVisibilities.forEach(function(recordType) {
 
             var type = recordType.recordType.substring(0, recordType.recordType.indexOf('.'));
 

javascript/updateProfile.js

@@ -8,7 +8,7 @@ module.exports = function(vlocity, currentContextData, jobInfo, callback) {
 
         var metadataUpdated = { 
             "fullName": "Admin", 
-            "fieldPermissions": metadata.fieldPermissions,
+            "fieldPermissions": metadata[0].fieldPermissions,
             "tabVisibilities": [],
             "recordTypeVisibilities": []
         };
@@ -18,7 +18,7 @@ module.exports = function(vlocity, currentContextData, jobInfo, callback) {
             field.readable = "true";
         });
 
-        metadata.tabVisibilities.forEach(function(tab) {
+        metadata[0].tabVisibilities.forEach(function(tab) {
             if (tab.tab.indexOf('__') != -1) {
                 tab.visibility = "DefaultOn";
                 metadataUpdated.tabVisibilities.push(tab);
@@ -27,7 +27,7 @@ module.exports = function(vlocity, currentContextData, jobInfo, callback) {
 
         var hasDefault = {};
 
-        metadata.recordTypeVisibilities.forEach(function(recordType) {
+        metadata[0].recordTypeVisibilities.forEach(function(recordType) {
 
             var type = recordType.recordType.substring(0, recordType.recordType.indexOf('.'));
 
@@ -36,7 +36,7 @@ module.exports = function(vlocity, currentContextData, jobInfo, callback) {
             }
         });
 
-        metadata.recordTypeVisibilities.forEach(function(recordType) {
+        metadata[0].recordTypeVisibilities.forEach(function(recordType) {
 
             var type = recordType.recordType.substring(0, recordType.recordType.indexOf('.'));
 

lib/datapacksjob.js

@@ -845,56 +845,48 @@ DataPacksJob.prototype.addRecordToExport = function(jobInfo, queryData, record)
 }
 
 DataPacksJob.prototype.runQueryForManifest = async function(queryInput) {
-    let promise = await new Promise((resolve) => {
-        var queryData = queryInput.queryData; 
-        var jobInfo = queryInput.jobInfo;
+    var queryData = queryInput.queryData;
+    var jobInfo = queryInput.jobInfo;
 
-        if (!queryData || !queryData.VlocityDataPackType || !queryData.query) {
-            return resolve();
+    if (!queryData || !queryData.VlocityDataPackType || !queryData.query) {
+        return;
+    }
+
+    if (!jobInfo.specificManifestKeys && jobInfo.allAllowedTypes) {
+        if (!jobInfo.allAllowedTypes.Vlocity || !jobInfo.allAllowedTypes.Vlocity[queryData.VlocityDataPackType]) {
+            return;
         }
+    }
 
-        if (!jobInfo.specificManifestKeys 
-            && jobInfo.allAllowedTypes) {
-            if (!jobInfo.allAllowedTypes.Vlocity 
-                || !jobInfo.allAllowedTypes.Vlocity[queryData.VlocityDataPackType]) {
-                return resolve();
-            }
-        } 
+    if (!jobInfo.fullManifest[queryData.VlocityDataPackType]) {
+        jobInfo.fullManifest[queryData.VlocityDataPackType] = {};
+    }
 
-        if (!jobInfo.fullManifest[queryData.VlocityDataPackType]) {
-            jobInfo.fullManifest[queryData.VlocityDataPackType] = {};
-        }
+    var query = this.vlocity.omnistudio.updateQuery(queryData.query).replace(/%vlocity_namespace%__/g, this.vlocity.namespacePrefix);
+    query = query.replace(" from ", " FROM ");
+    if (query.includes(" FROM ")) {
+        const subQuery = query.split(" FROM ");
+        query = subQuery[0] + ',CreatedBy.Name, CreatedDate, LastModifiedBy.Name, LastModifiedDate FROM ' + subQuery[1];
+    }
 
-        var query = this.vlocity.omnistudio.updateQuery(queryData.query).replace(/%vlocity_namespace%__/g, this.vlocity.namespacePrefix);
-        query = query.replace(" from ", " FROM ");     
-        if (query.includes(" FROM ")) {
-            const subQuery = query.split(" FROM ");
-            query = subQuery[0] + ',CreatedBy.Name, CreatedDate, LastModifiedBy.Name, LastModifiedDate FROM ' + subQuery[1];
+    await this.vlocity.jsForceConnection.query(query)
+    .on("record", (record) => {
+        var recordAdded = this.addRecordToExport(jobInfo, queryData, record);
+        if (recordAdded) {
+            VlocityUtils.verbose('Found From Manifest', record.Id, recordAdded.VlocityDataPackType, recordAdded.VlocityDataPackDisplayLabel);
         }
-
-        this.vlocity.jsForceConnection.query(query)
-        .on("record", (record) => {
-            var recordAdded = this.addRecordToExport(jobInfo, queryData, record);
-            if (recordAdded) {
-                VlocityUtils.verbose('Found From Manifest', record.Id, recordAdded.VlocityDataPackType, recordAdded.VlocityDataPackDisplayLabel);
-            }
-        })
-        .on("error", (err) => {
-            VlocityUtils.report('VlocityDataPackType', queryData.VlocityDataPackType);
-            VlocityUtils.report('Query', query);
-            VlocityUtils.error('Query Error', err);
-            resolve();
-        })
-        .on("end", () => {
-            VlocityUtils.report('VlocityDataPackType', queryData.VlocityDataPackType);
-            VlocityUtils.report('Query', query);
-            VlocityUtils.report('Records', Object.keys(jobInfo.fullManifest[queryData.VlocityDataPackType]).length);
-            resolve();
-        })
-        .run({ autoFetch : true, maxFetch : 100000 });
-    });
-
-    return promise;
+    })
+    .on("error", (err) => {
+        VlocityUtils.report('VlocityDataPackType', queryData.VlocityDataPackType);
+        VlocityUtils.report('Query', query);
+        VlocityUtils.error('Query Error', err);
+    })
+    .on("end", () => {
+        VlocityUtils.report('VlocityDataPackType', queryData.VlocityDataPackType);
+        VlocityUtils.report('Query', query);
+        VlocityUtils.report('Records', Object.keys(jobInfo.fullManifest[queryData.VlocityDataPackType]).length);
+    })
+    .run({ autoFetch: true, maxFetch: 100000 });
 }
 
 DataPacksJob.prototype.buildManifestFromQueries = async function(jobInfo) {
@@ -3430,9 +3422,6 @@ DataPacksJob.prototype.downloadPerformanceData = async function (jobInfo) {
             if(existingRecords.length > 0){
                 jobInfo.data = existingRecords;
                 jobInfo.hasError = false;
-            } else {
-                jobInfo.hasError = true;
-                jobInfo.errors.push('No Tracking Entries Found');
             }
             return resolve();
         } else if(totalEntries.totalSize > 50000) {