Merge pull request #565 from vlocityinc/alpha

Merge alpha into beta
vlocityinc · Feb 22, 2023 · d9f7058 · d9f7058
2 parents 0fc96ab + c8ef9cf
commit d9f7058
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:16
 RUN dpkg --add-architecture i386
 
 RUN apt-get update
@@ -10,8 +10,8 @@ RUN npm install --global publish-release
 
 RUN npm install --global pkg-fetch
 #RUN pkg-fetch -n node10 -p win -a x64
-RUN pkg-fetch -n node10 -p linux -a x64
-RUN pkg-fetch -n node10 -p macos -a x64
+RUN pkg-fetch -n node16 -p linux -a x64
+RUN pkg-fetch -n node16 -p macos -a x64
 
 RUN npm install --global pkg@4.3.8
 

diff --git a/lib/datapacksutils.js b/lib/datapacksutils.js
@@ -11,6 +11,7 @@ const UtilityService = require('./utilityservice.js');
 var filterxml = require('filterxml');
 var xml2js = require('xml2js');
 var xmlbuilder = require('xmlbuilder');
+const csvParser = require('json2csv');
 
 
 // use consts for setting the namespace prefix so that we easily can reference it later on in this file
@@ -2883,7 +2884,10 @@ DataPacksUtils.prototype.createBulkJob = async function (objectName, operation,
 
                 var batch = job.createBatch();
 
-                batch.execute(data.splice(0, thisBatchSize))
+                VlocityUtils.verbose('Converting to CSV');
+                const csvData = csvParser.parse(data.splice(0, thisBatchSize));
+
+                batch.execute(csvData)
                     .on("error", function (batchInfo) {
                         VlocityUtils.error('Error Uploading Batch', batchInfo);
                         error = 'Batch Upload Error';

diff --git a/lib/querydefinition.yaml b/lib/querydefinition.yaml
@@ -24,7 +24,7 @@ CalculationProcedureVersion:
   requiredSetting: separateCalculationProcedureVersions
 Catalog:
   VlocityDataPackType: Catalog
-  query: Select Id, Name from %vlocity_namespace%__Catalog__c   
+  query: Select Id, Name, %vlocity_namespace%__GlobalKey__c from %vlocity_namespace%__Catalog__c   
 ChargeMeasurement:
   VlocityDataPackType: ChargeMeasurement
   query: Select Id, Name from %vlocity_namespace%__ChargeMeasurement__c   

diff --git a/lib/sfdx.js b/lib/sfdx.js
@@ -1,7 +1,7 @@
 const shell = require('shelljs');
 
 const _run = (command) => {
-	command += ' --json';
+	command = 'FORCE_COLOR=0 ' + command + ' --json';
 	const exec = shell.exec(command, { silent: true });
 	let stdout;
 
@@ -42,4 +42,4 @@ const run = async(command, options) => {
 
 module.exports = {
 	run
-}
+}
diff --git a/package.json b/package.json
@@ -16,12 +16,13 @@
         "js-yaml": "3.13.1",
         "jsforce": "1.9.3",
         "json-stable-stringify": "1.0.1",
-        "runtime-plugin-manager-clone": "0.1.0",
+        "json2csv": "6.0.0-alpha.2",
         "mustache": "3.0.0",
         "nopt": "4.0.1",
         "opn": "6.0.0",
         "properties": "1.2.1",
         "puppeteer-core": "^5.3.1",
+        "runtime-plugin-manager-clone": "0.1.0",
         "salesforce-alm": "49.5.0",
         "sass.js": "0.11.1",
         "semver": "6.2.0",

diff --git a/test/salesforce_sfdx/main/default/profiles/TESTVDXProfile.profile-meta.xml b/test/salesforce_sfdx/main/default/profiles/TESTVDXProfile.profile-meta.xml
@@ -33005,9 +33005,6 @@
     <layoutAssignments>
         <layout>WorkBadge-Badge Received Layout</layout>
     </layoutAssignments>
-    <layoutAssignments>
-        <layout>WorkBadgeDefinition-Badge Layout</layout>
-    </layoutAssignments>
     <layoutAssignments>
         <layout>WorkOrder-Work Order Layout</layout>
     </layoutAssignments>
@@ -38998,9 +38995,9 @@
         <visible>false</visible>
     </recordTypeVisibilities>
     <recordTypeVisibilities>
-        <default>false</default>
+        <default>true</default>
         <recordType>vlocity_cmt__IntegrationRetryPolicy__c.vlocity_cmt__NoRetryPolicy</recordType>
-        <visible>false</visible>
+        <visible>true</visible>
     </recordTypeVisibilities>
     <recordTypeVisibilities>
         <default>false</default>
@@ -40195,5 +40192,29 @@
     <userPermissions>
         <enabled>true</enabled>
         <name>WorkCalibrationUser</name>
+    </userPermissions> 
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ViewAllForecasts</name>
+    </userPermissions>
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ManageQuotas</name>
+    </userPermissions>
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ViewArchivedArticles</name>
+    </userPermissions>
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ViewDraftArticles</name>
+    </userPermissions>
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ManageTerritories</name>
+    </userPermissions>
+    <userPermissions>
+        <enabled>true</enabled>
+        <name>ManageTranslation</name>
     </userPermissions>
 </Profile>