Skip to content

Commit 2aa4e6d

Browse files
authored
Merge pull request #1088 from salesforcecli/ksc/add-versionsettings
W-16187953: add version settings field/column to sf package installed list
2 parents 8223e44 + 58375a0 commit 2aa4e6d

5 files changed

Lines changed: 44 additions & 15 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@oclif/core": "^4",
99
"@salesforce/core": "^8.24.0",
1010
"@salesforce/kit": "^3.2.4",
11-
"@salesforce/packaging": "^4.18.1",
11+
"@salesforce/packaging": "^4.18.2",
1212
"@salesforce/sf-plugins-core": "^12.2.6",
1313
"chalk": "^5.6.2"
1414
},

schemas/package-installed-list.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"SubscriberPackageNamespace": {
2424
"type": "string"
2525
},
26+
"VersionSettings": {
27+
"type": "string"
28+
},
2629
"SubscriberPackageVersionId": {
2730
"type": "string"
2831
},

src/commands/package/installed/list.ts

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export type PackageInstalledListResult = {
3131
SubscriberPackageId?: string;
3232
SubscriberPackageName?: string;
3333
SubscriberPackageNamespace?: string;
34+
VersionSettings?: string;
3435
SubscriberPackageVersionId?: string;
3536
SubscriberPackageVersionName?: string;
3637
SubscriberPackageVersionNumber?: string;
@@ -54,7 +55,29 @@ export class PackageInstalledListCommand extends SfCommand<PackageInstalledComma
5455
const { flags } = await this.parse(PackageInstalledListCommand);
5556
const records = (
5657
await SubscriberPackageVersion.installedList(flags['target-org'].getConnection(flags['api-version']))
57-
).map(transformRow);
58+
).map((r) => {
59+
const transformed = transformRow(r);
60+
61+
// Calculate Version Settings from the data already in the result
62+
if (r.SubscriberPackageVersion) {
63+
const isManaged = r.SubscriberPackageVersion.IsManaged;
64+
const package2ContainerOptions = r.SubscriberPackageVersion.Package2ContainerOptions;
65+
66+
// Use namespace for 1GP managed packages. For 2GP managed packages use packageId. For anything else,
67+
// Version Settings is not applicable, so leave it empty.
68+
if (isManaged && !package2ContainerOptions) {
69+
transformed.VersionSettings = 'namespace';
70+
} else if (package2ContainerOptions === 'Managed') {
71+
transformed.VersionSettings = 'packageId';
72+
} else {
73+
transformed.VersionSettings = '';
74+
}
75+
} else {
76+
transformed.VersionSettings = '';
77+
}
78+
79+
return transformed;
80+
});
5881

5982
this.table({
6083
data: records,
@@ -63,6 +86,7 @@ export class PackageInstalledListCommand extends SfCommand<PackageInstalledComma
6386
{ key: 'SubscriberPackageId', name: 'Package ID' },
6487
{ key: 'SubscriberPackageName', name: 'Package Name' },
6588
{ key: 'SubscriberPackageNamespace', name: 'Namespace' },
89+
{ key: 'VersionSettings', name: 'Version Settings' },
6690
{ key: 'SubscriberPackageVersionId', name: 'Package Version ID' },
6791
{ key: 'SubscriberPackageVersionName', name: 'Version Name' },
6892
{ key: 'SubscriberPackageVersionNumber', name: 'Version' },

test/commands/package/packageInstalledList.nut.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ describe('package:installed:list', () => {
4747
'SubscriberPackageId',
4848
'SubscriberPackageName',
4949
'SubscriberPackageNamespace',
50+
'VersionSettings',
5051
'SubscriberPackageVersionId',
5152
'SubscriberPackageVersionName',
5253
'SubscriberPackageVersionNumber'
@@ -55,6 +56,7 @@ describe('package:installed:list', () => {
5556
expect(output?.SubscriberPackageId).to.be.a('string');
5657
expect(output?.SubscriberPackageName).to.be.a('string');
5758
expect(output?.SubscriberPackageNamespace).to.be.a('string');
59+
expect(output?.VersionSettings).to.be.a('string');
5860
expect(output?.SubscriberPackageVersionId).to.be.a('string');
5961
expect(output?.SubscriberPackageVersionName).to.be.a('string');
6062
expect(output?.SubscriberPackageVersionNumber).to.be.a('string');

yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@
13001300
"@jridgewell/resolve-uri" "^3.1.0"
13011301
"@jridgewell/sourcemap-codec" "^1.4.14"
13021302

1303-
"@jsforce/jsforce-node@^3.10.10", "@jsforce/jsforce-node@^3.10.8":
1303+
"@jsforce/jsforce-node@^3.10.10":
13041304
version "3.10.10"
13051305
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.10.10.tgz#2d7bb77d1d739712733a30de7e9c941d2127bc4a"
13061306
integrity sha512-/zUOX9kapwk8lyjmTYgXlBF+GbqcEpb0zrkDfX9i94xu5cvzERZxRHqSSaS/IImoDmvoSbatFSVfB7Y4lmANOw==
@@ -1586,17 +1586,17 @@
15861586
dependencies:
15871587
"@salesforce/ts-types" "^2.0.12"
15881588

1589-
"@salesforce/packaging@^4.18.1":
1590-
version "4.18.1"
1591-
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-4.18.1.tgz#3a845d0cc688acd0bebc901d280c295f81d30a65"
1592-
integrity sha512-8h6t+wK4YrdKzyIUYvjI0C4Pr6mUsJJiAy80KD1A/cQvn++34I6/AJu7/2tTtcvp3RHa7wQX3SS5M/C1obrwUg==
1589+
"@salesforce/packaging@^4.18.2":
1590+
version "4.18.2"
1591+
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-4.18.2.tgz#36561207fe02f56e0451e2e925258445d11f02c8"
1592+
integrity sha512-/xOhDU9UvHwcz3C1EbLZ8KuZuYD6EJ2SiKLEZJjztTQpSMmq1sTW3Q3i2RwzuWVK0IZ1u2BU8Ck9zK66Vwrscw==
15931593
dependencies:
1594-
"@jsforce/jsforce-node" "^3.10.8"
1595-
"@salesforce/core" "^8.23.3"
1594+
"@jsforce/jsforce-node" "^3.10.10"
1595+
"@salesforce/core" "^8.24.0"
15961596
"@salesforce/kit" "^3.2.4"
15971597
"@salesforce/schemas" "^1.10.3"
1598-
"@salesforce/source-deploy-retrieve" "^12.24.0"
1599-
"@salesforce/ts-types" "^2.0.11"
1598+
"@salesforce/source-deploy-retrieve" "^12.30.2"
1599+
"@salesforce/ts-types" "^2.0.12"
16001600
"@salesforce/types" "^1.2.0"
16011601
fast-xml-parser "^4.5.0"
16021602
globby "^11"
@@ -1664,10 +1664,10 @@
16641664
cli-progress "^3.12.0"
16651665
terminal-link "^3.0.0"
16661666

1667-
"@salesforce/source-deploy-retrieve@^12.24.0":
1668-
version "12.30.0"
1669-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.30.0.tgz#cae4e00b5f9f301f28d9224997f63bfa5a7ede1b"
1670-
integrity sha512-elfNE4NRw2JNRsYoS/e9Gi2KdaFg7c2JVdRY6ZT20vpxV3z81SvvbYhauiKOYkVvsP3Y+FBEzWiG6AwdF0fSWA==
1667+
"@salesforce/source-deploy-retrieve@^12.30.2":
1668+
version "12.30.2"
1669+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.30.2.tgz#4ea3c62ad04d31ccbb1d6b95853eec2b529e03bb"
1670+
integrity sha512-hR682AqqLX40ie2GZmRjN+yeg4S6x5rAxhu1fOHbbsxwfOFJjhi40SJR8pgNb1uxbL+P8EWsIauzTLpp6qbcBA==
16711671
dependencies:
16721672
"@salesforce/core" "^8.23.4"
16731673
"@salesforce/kit" "^3.2.4"

0 commit comments

Comments
 (0)