Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.16.4 #566

Merged
merged 7 commits into from
Feb 24, 2023
Merged

Release v1.16.4 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
088fcf2
W-12484068: Convert Batch Deployment to Use CSV instead of raw JSON
lmckusick Feb 21, 2023
7216fff
Update Node version in Dockerfile, json2csv version
lmckusick Feb 21, 2023
13efc6d
Dockerfile - node version
lmckusick Feb 21, 2023
d3b3af2
Merge pull request #562 from vlocityinc/lskel-w-12484068
manas-sf Feb 22, 2023
167964c
Disable colouring of SFDX CLI output (#560)
thvd Feb 22, 2023
c8ef9cf
Adding globalkey to catalog query (#554)
KevinGossentCap Feb 22, 2023
d9f7058
Merge pull request #565 from vlocityinc/alpha
manas-sf Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10
FROM node:16
RUN dpkg --add-architecture i386

RUN apt-get update
Expand All @@ -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

Expand Down
6 changes: 5 additions & 1 deletion lib/datapacksutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/querydefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/sfdx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -42,4 +42,4 @@ const run = async(command, options) => {

module.exports = {
run
}
}
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
31 changes: 26 additions & 5 deletions test/salesforce_sfdx/main/default/profiles/TESTVDXProfile.profile-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>