Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
module.exports = {
extends: ['eslint-config-salesforce-typescript', 'plugin:sf-plugin/recommended'],
ignorePatterns: [
'.eslintrc.cjs',
'dist',
'node_modules'
]
};
4 changes: 0 additions & 4 deletions messages/connected-objects.upsert.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ Print the changed fields into the outcome table

Recipes not found in the repository

# nothing.changed

Nothing changed

# connector.not.found

Connector named %s not found. Create an empty data connection to proceed
Expand Down
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@
"version": "1.1.3",
"author": "Luca Bassani",
"dependencies": {
"@oclif/core": "^3.22.0",
"@salesforce/core": "^6.7.0",
"@salesforce/sf-plugins-core": "^7.1.14",
"@salesforce/source-deploy-retrieve": "^10.5.1"
"@oclif/core": "^4",
"@salesforce/core": "^8.25.1",
"@salesforce/sf-plugins-core": "^12.2.6",
"@salesforce/source-deploy-retrieve": "^12.32.1",
"@salesforce/kit": "^3.2.4",
"@salesforce/ts-types": "^2.0.12"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.1.0",
"@salesforce/cli-plugins-testkit": "^5.1.10",
"@salesforce/dev-scripts": "^8.4.2",
"@types/mocha": "^10.0.6",
"eslint-plugin-sf-plugin": "^1.17.4",
"oclif": "^4.5.0",
"shx": "^0.3.4",
"@oclif/plugin-command-snapshot": "^5.3.15",
"@salesforce/cli-plugins-testkit": "^5.3.52",
"@salesforce/dev-scripts": "^11.0.4",
"@salesforce/plugin-command-reference": "^3.1.88",
"eslint-plugin-sf-plugin": "^1.20.33",
"oclif": "^4.22.96",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
"typescript": "^5.9.3"
},
"engines": {
"node": ">=18.0.0"
Expand Down
60 changes: 20 additions & 40 deletions src/commands/analytics/connected-objects/upsert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ import { Messages, SfError } from '@salesforce/core';
import { MetadataHelper } from '../../../metadataHelper.js';
import { ApiHelper } from '../../../apiHelper.js';
import { RecipeDefinition, LoadDefinitionNodeParam, ReplicatedDataset } from '../../../modules/upsert.js';
import { PrinterHelper } from '../../../printerHelper.js';

Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
const messages = Messages.loadMessages('plugin-analytics-connected-objects', 'connected-objects.upsert');
const common = Messages.loadMessages('plugin-analytics-connected-objects', 'common');

export interface ConnectedObjectUpsertResult {
export type ConnectedObjectUpsertResult = {
[key: string]: string | boolean | string[] | number | undefined;
objectName: string;
connectorName: string;
Expand All @@ -33,8 +32,7 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
'target-org': Flags.requiredOrg({
char: 'o',
summary: common.getMessage('flags.target-org.summary'),
description: common.getMessage('flags.target-org.description'),
required: true,
description: common.getMessage('flags.target-org.description')
}),
'recipe-names': Flags.string({
char: 'n',
Expand All @@ -50,7 +48,7 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
}),
verbose: Flags.boolean({
summary: messages.getMessage('flags.verbose.summary'),
}),
})
};

public async run(): Promise<ConnectedObjectUpsertResult[]> {
Expand Down Expand Up @@ -114,7 +112,6 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
}
const fieldSet = objectFields.get(dataset.sourceObjectName) as Set<string>;
const { changedFields, missingFields } = await service.updateReplicatedDatasetFields(dataset.id, fieldSet);

if (missingFields.length > 0) {
const message = messages.getMessage('fields.not.found', [
objectName,
Expand All @@ -123,11 +120,10 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
]);
warnMessages.push(message);
}
if (changedFields.length > 0) {
const item = resultMap.get(dataset.sourceObjectName) as ConnectedObjectUpsertResult;
item.fields = changedFields;
item.fieldsCount = changedFields.length;
}
const item = resultMap.get(dataset.sourceObjectName) as ConnectedObjectUpsertResult;
item.fields = changedFields;
item.fieldsCount = changedFields.length;
item.operation = changedFields.length === 0 ? 'Unchanged' : item.isNew ? 'Created' : 'Updated';
current++;
progressBar.update(current);
}
Expand All @@ -142,15 +138,8 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
this.warn(warnMessage);
}
}

const result: ConnectedObjectUpsertResult[] = Array.from(resultMap.values()).filter(
(x) => x.fields && x.fields.length > 0
);
if (result.length > 0) {
this.printConnectionUpgradeResult(result, flags.verbose);
} else {
this.log(messages.getMessage('nothing.changed'));
}
const result: ConnectedObjectUpsertResult[] = Array.from(resultMap.values());
this.printConnectionUpgradeResult(result);
return result;
}

Expand Down Expand Up @@ -184,25 +173,16 @@ export default class ConnectedObjectsUpsert extends SfCommand<ConnectedObjectUps
return response;
}

private printConnectionUpgradeResult(records: ConnectedObjectUpsertResult[], verbose: boolean): void {
this.table(
records,
{
objectName: { header: 'OBJECT' },
connectorName: { header: 'CONNECTOR' },
isNEW: {
header: 'OPERATION',
get: (data): string => (data.isNew ? 'Create' : 'Update'),
},
fieldsCount: { header: 'FIELDSCOUNT' },
fields: {
header: 'FIELDS',
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
get: (data): string => PrinterHelper.printFieldsMultiline(data.fields!, 60),
extended: !verbose,
},
},
{ title: 'Changed connected-objects' }
);
private printConnectionUpgradeResult(records: ConnectedObjectUpsertResult[]): void {
const columns = [
{ key: 'objectName', name: 'Object' },
{ key: 'connectorName', name: 'Connector' },
{ key: 'operation', name: 'Operation' },
{ key: 'fieldsCount', name: 'Added Fields' }
];
this.table({
data: records,
columns
});
}
}
20 changes: 0 additions & 20 deletions src/printerHelper.ts

This file was deleted.

3 changes: 3 additions & 0 deletions test/commands/analytics/connected-objects/upsert.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe('analytics connected-objects upsert NUTs', () => {
connectorName: 'SFDC_LOCAL',
objectName: 'User',
isNew: true,
operation: 'Created',
fields: ['Id', 'Username'],
fieldsCount: 2,
},
Expand All @@ -55,6 +56,7 @@ describe('analytics connected-objects upsert NUTs', () => {
connectorName: 'SFDC_LOCAL',
objectName: 'User',
isNew: false,
operation: 'Updated',
fields: [
'LastName',
'FirstName',
Expand All @@ -75,6 +77,7 @@ describe('analytics connected-objects upsert NUTs', () => {
connectorName: 'SFDC_LOCAL',
objectName: 'Profile',
isNew: true,
operation: 'Created',
fields: ['Id', 'Name'],
fieldsCount: 2,
},
Expand Down
7 changes: 5 additions & 2 deletions test/commands/analytics/connected-objects/upsert.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import path, { resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import { expect } from 'chai';
import { TestContext, MockTestOrgData } from '@salesforce/core/lib/testSetup.js';
import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
import { ensureJsonMap, AnyJson } from '@salesforce/ts-types';
import { Config } from '@oclif/core';
import { ComponentSet, ComponentSetBuilder, LazyCollection, SourceComponent } from '@salesforce/source-deploy-retrieve';
Expand Down Expand Up @@ -63,6 +63,7 @@ describe('analytics recipe run', () => {
{
objectName: 'User',
isNew: true,
operation: 'Created',
fields: recipeFields,
fieldsCount: recipeFields.length,
connectorName: 'SFDC_LOCAL',
Expand All @@ -87,6 +88,7 @@ describe('analytics recipe run', () => {
{
objectName: 'User',
isNew: false,
operation: 'Updated',
fields: [USERNAME],
fieldsCount: 1,
connectorName: 'SFDC_LOCAL',
Expand Down Expand Up @@ -122,7 +124,8 @@ describe('analytics recipe run', () => {
);
const cmd = new ConnectedObjectsUpsert([...commandParams, '--json', '--verbose'], config);
const result = await cmd.run();
expect(result).to.lengthOf(0);
expect(result).to.lengthOf(1);
expect(result[0].fieldsCount).to.equal(0);
});
});

Expand Down
4 changes: 2 additions & 2 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "@salesforce/dev-config/tsconfig-test-strict-esm",
"include": ["./**/*.ts"],
"compilerOptions": {
"skipLibCheck": true,
"strictNullChecks": true
"types": ["mocha", "node"],
"skipLibCheck": true
}
}
Loading
Loading