Merge pull request #298 from mdmehran-qureshi/prerelease/alpha

Multiple Omnistudio packages in single org & lint resolve

Author: mdmehran-qureshi

messages/migrate.json

@@ -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.",
@@ -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"
 }
+

src/commands/omnistudio/migration/assess.ts

@@ -125,7 +125,8 @@ export default class Assess extends OmniStudioBaseCommand {
     try {
       orgs.rollbackFlags = await OrgPreferences.checkRollbackFlags(conn);
     } catch (error) {
-      this.ux.log(error);
+      Logger.log((error as Error).message);
+      Logger.log((error as Error).stack);
     }
     await AssessmentReporter.generate(assesmentInfo, conn.instanceUrl, orgs, assessOnly, objectsToProcess);
     return assesmentInfo;

src/commands/omnistudio/migration/migrate.ts

@@ -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;

src/utils/orgUtils/index.ts

@@ -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;
@@ -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,