Skip to content

Multiple Omnistudio packages in single org & lint resolve #298

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.

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

Merged
Show file tree
Hide file tree
Changes from 2 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 messages/migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
"deployingMetadata": "Deploying metadata %s to %s",
"metadataDeployed": "Metadata %s deployed to %s",
"sfProjectCommandError": "Error executing command: %s",
"multiplePackagesFound": "Multiple OmniStudio packages found. Please select one:",
"packageSelectionPrompt": "Enter the number of the package to use (1-%s):",
"invalidPackageSelection": "Invalid selection. Please enter a number between 1 and %s.",
"selectedPackage": "Selected package: %s (Version: %s)"
"dataRaptorNameChangeMessage": "DataRaptor reference {0} will be changed to {1} during migration.",
"integrationProcedureNameChangeMessage": "Integration Procedure reference {0} will be changed to {1} during migration.",
"integrationProcedureManualUpdateMessage": "Integration Procedure reference {0} may need manual updates after migration.",
Expand All @@ -81,3 +85,4 @@
"cardNameChangeMessage": "Card name has been modified to fit naming rules: {0}",
"duplicateCardNameMessage": "Potential duplicate: Another card has the same name {0} after name cleaning. This may cause conflicts during migration",
}

3 changes: 2 additions & 1 deletion src/commands/omnistudio/migration/assess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ export default class Assess extends OmniStudioBaseCommand {
try {
orgs.rollbackFlags = await OrgPreferences.checkRollbackFlags(conn);
} catch (error) {
this.ux.log(error.message);
Logger.log((error as Error).message);
Logger.log((error as Error).stack);
}
await AssessmentReporter.generate(assesmentInfo, conn.instanceUrl, orgs, assessOnly, objectsToProcess);
return assesmentInfo;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/omnistudio/migration/migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default class Migrate extends OmniStudioBaseCommand {
await OrgPreferences.enableOmniPreferences(conn);
} catch (error) {
const errMsg = error instanceof Error ? error.message : String(error);
this.ux.log(`Could not enable Omni preferences: ${errMsg}`);
Logger.log(`Could not enable Omni preferences: ${errMsg}`);
}

const namespace = orgs.packageDetails.namespace;
Expand Down
4 changes: 2 additions & 2 deletions src/utils/file/fileUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ export function pushAssestUtilites(folderName: string, destDir: string): void {
} catch (copyErr) {
Logger.error(`Error copying file ${srcPath} to ${destPath}: ${copyErr}`);
Logger.error(JSON.stringify(copyErr));
Logger.error(copyErr.stack);
Logger.error((copyErr as Error).stack);
}
}
});
} catch (readDirErr) {
Logger.error(`Error reading directory ${sourceDir}: ${readDirErr}`);
Logger.error(JSON.stringify(readDirErr));
Logger.error(readDirErr.stack);
Logger.error((readDirErr as Error).stack);
}
}
48 changes: 43 additions & 5 deletions src/utils/orgUtils/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
/* eslint-disable */

import { Connection } from '@salesforce/core';
import { Connection, Messages } from '@salesforce/core';
import { QueryTools } from '../query';
import { Logger } from '../logger';

// Load messages
const messages = Messages.loadMessages('@salesforce/plugin-omnistudio-migration-tool', 'migrate');

interface InstalledPackage {
MajorVersion: number;
Expand Down Expand Up @@ -312,18 +316,52 @@ export class OrgUtils {
break;
}
}

const installedOmniPackages = [];
if (packageDetails.namespace === '') {
hasValidNamespace = false;
for (const pkg of allInstalledPackages) {
if ((namespace && namespace === pkg.NamespacePrefix) || this.namespaces.has(pkg.NamespacePrefix)) {
packageDetails.version = `${pkg.MajorVersion}.${pkg.MinorVersion}`;
packageDetails.namespace = pkg.NamespacePrefix;
break; // Exit loop after first match
installedOmniPackages.push(pkg);
}
}
}

// Handle multiple packages by prompting user to select one
if (installedOmniPackages.length > 1) {
Logger.log(messages.getMessage('multiplePackagesFound'));

// Display available packages
for (let i = 0; i < installedOmniPackages.length; i++) {
const pkg = installedOmniPackages[i];
Logger.log(`${i + 1}. ${pkg.NamespacePrefix} - Version ${pkg.MajorVersion}.${pkg.MinorVersion}`);
}

// Prompt user to select a package
let selectedIndex: number;
do {
const selection = await Logger.prompt(messages.getMessage('packageSelectionPrompt', [installedOmniPackages.length.toString()]));
selectedIndex = parseInt(selection, 10) - 1;

if (isNaN(selectedIndex) || selectedIndex < 0 || selectedIndex >= installedOmniPackages.length) {
Logger.warn(messages.getMessage('invalidPackageSelection', [installedOmniPackages.length.toString()]));
}
} while (isNaN(selectedIndex) || selectedIndex < 0 || selectedIndex >= installedOmniPackages.length);

// Set the selected package details
const selectedPackage = installedOmniPackages[selectedIndex];
packageDetails.version = `${selectedPackage.MajorVersion}.${selectedPackage.MinorVersion}`;
packageDetails.namespace = selectedPackage.NamespacePrefix;
hasValidNamespace = true;

Logger.log(messages.getMessage('selectedPackage', [selectedPackage.NamespacePrefix, packageDetails.version]));
} else if (installedOmniPackages.length === 1) {
// Only one package found, use it automatically
const pkg = installedOmniPackages[0];
packageDetails.version = `${pkg.MajorVersion}.${pkg.MinorVersion}`;
packageDetails.namespace = pkg.NamespacePrefix;
hasValidNamespace = true;
}

//Execute apex rest resource to get omnistudio org permission
const omniStudioOrgPermissionEnabled: boolean = await this.isOmniStudioOrgPermissionEnabled(
connection,
Expand Down