chore: saving changes from upstream and fixes

Author: sf-aastha-paruthi

.gitignore

@@ -46,6 +46,6 @@ oclif.manifest.json
 omnistudio_migration
 
 assessment_reports/
-migration_report/
+migration_reports/
 .sfdx/
 package.xml

README.md

@@ -114,7 +114,7 @@ sfdx omnistudio:migration:migrate -u [email protected] --only=autonum
 
 ```
 USAGE
-  $ sf omnistudio:migration:assess [-f] [-v <string>] [-u <string>] [--loglevel
+  $ sf omnistudio:migration:assess [-v <string>] [-u <string>] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
 
 OPTIONS
@@ -149,7 +149,7 @@ OPTIONS
 
 ```
 USAGE
-  $ sf omnistudio:migration:migrate [-f] [-v <string>] [-u <string>] [--loglevel
+  $ sf omnistudio:migration:migrate [-v <string>] [-u <string>] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
 
 OPTIONS

messages/assess.json

@@ -16,16 +16,17 @@
   "couldNotTruncate": "We couldn't clear all %s records.",
   "couldNotTruncateOmnniProcess": "We couldn't clear all records of your %s because the %s is referenced in an Omniscript or a Flexcard.",
   "invalidOrRepeatingOmniscriptElementNames": "Omniscript with invalid or duplicate element names found. Rename your Omniscript elements and try again.",
-  "duplicatedCardName": "Flexcard with duplicate name, type, subtype, or language found in this org. Modify your Flexcard and try again.",
+  "duplicatedCardName": "Flexcard with duplicate name found in this org. Modify your Flexcard and try again.",
   "duplicatedDrName": "Data Mapper with duplicate name found in this org. Rename your Data Mapper and try again.",
   "duplicatedOSName": "Omniscript with duplicate name, type, subtype, or language found in this org. Modify your Omniscript and try again.",
-  "duplicatedName": "Duplicated name",
+  "duplicatedName": "Duplicated name %s",
+  "lowerVersionDuplicateOmniscriptName": "A %s with name \"%s\" will not be migrated because lower version of same %s will be marked as duplicate, which could lead to conflicts during migration.",
   "errorWhileActivatingOs": "We couldn't activate your %s:",
   "errorWhileActivatingCard": "We couldn't activate your Flexcard:",
   "errorWhileUploadingCard": "We couldn't deploy your Flexcard to your org. Review these errors:",
   "errorWhileCreatingElements": "We couldn't save elements in your Omniscript. Review these errors:",
   "allVersionsDescription": "Migrate all versions of a component",
-  "changeMessage": "%s will be changed from %s to %s",
+  "changeMessage": "The %s %s will be changed from %s to %s",
   "angularOSWarning": "We couldn't migrate Angular Omniscripts. Convert all Angular Omniscripts to LWC Omniscripts, and try again.",
   "relatedObjectGA": "Select the component type that you want to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, 'flexipage' for FlexiPages, 'expsites' for Experience Sites, or 'apex, lwc, flexipage, expsites' if you want to include all types.",
   "noPackageInstalled": "No managed package found in your org.",
@@ -92,11 +93,13 @@
   "methodCallBundleNameUpdated": "Method call bundle name will be updated in %s for the %s class and %s method.",
   "cardNameChangeMessage": "The Flexcard name will be changed from %s to %s to adhere to the API naming standards.",
   "authordNameChangeMessage": "The Flexcard author name will be changed from %s to %s to adhere to the naming rules: %s",
+  "cardLWCNameChangeMessage": "The Flexcard generated LWC name will be changed from %s to %s to align with Flexcard name change.",
   "omniScriptNameChangeMessage": "The Omniscript reference name %s will be changed to %s during migration.",
-  "dataRaptorNameChangeMessage": "The Data Mapper %s will be renamed to %s during migration.",
+  "dataRaptorNameChangeMessage": "The Data Mapper name will be changed from %s to %s during migration.",
   "integrationProcedureNameChangeMessage": "The Integration Procedure %s will be renamed to %s during migration.",
   "integrationProcedureManualUpdateMessage": "All references to %s in this Integration Procedure must be manually updated after migration.",
   "duplicateCardNameMessage": "A Flexcard with the same name \"%s\" already exists after name cleaning, which could lead to conflicts during migration.",
+  "lowerVersionDuplicateCardNameMessage": "A Flexcard with the name \"%s\" will not be migrated because lower version of same card will be marked as duplicate, which could lead to conflicts during migration.",
   "startingCustomLabelAssessment": "Starting Custom Label assessment",
   "assessedCustomLabelsCount": "Found %s labels that need attention out of %s total",
   "customLabelAssessmentCompleted": "Custom Label assessment completed",
@@ -193,11 +196,13 @@
   "generatedCustomLabelAssessmentReportPage": "Generated custom label assessment report page %s of %s with %s labels",
   "manualDeploymentSteps": "<a href='%s' target='_blank'>Please refer to this documentation for manual deployment process</a>",
   "varDeclarationUpdated": "Variable initialization will be updated for target name",
-  "ipNameUpdateFailed": "IP reference %s can’t be updated",
-  "dmNameUpdateFailed": "DM reference %s can’t be updated",
+  "ipNameUpdateFailed": "Integration Procedure reference can’t be updated at line %s",
+  "dmNameUpdateFailed": "Data Mapper reference can’t be updated at line %s",
+  "ipNameReferenceNotFound": "Integration Procedure reference can’t be updated",
+  "dmNameReferenceNotFound": "Data Mapper reference can’t be updated",
   "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again",
   "assessmentSuccessfulMessage": "Migration assessment for org %s is complete and reports are ready for review in the folder %s",
   "errorCheckingOmniStudioMetadata": "Error while checking the Omnistudio settings metadata status: %s.",
-  "omniStudioSettingsMetadataAlreadyEnabled": "The Omnistudio Metadata setting is already enabled with standard data model. No need for migration."
+  "omniStudioSettingsMetadataAlreadyEnabled": "The Omnistudio Metadata setting is already enabled with standard data model. No need for migration.",
   "missingMandatoryField": "Missing mandatory field: %s for %s"
 }

messages/migrate.json

@@ -19,9 +19,11 @@
   "couldNotTruncate": "We couldn't clear all %s records.",
   "couldNotTruncateOmnniProcess": "We couldn't clear all records of your %s because the %s is referenced in an Omniscript or a Flexcard.",
   "invalidOrRepeatingOmniscriptElementNames": "Omniscript with invalid or duplicate element names found. Rename your Omniscript elements and try again.",
-  "duplicatedCardName": "Flexcard with duplicate name, type, subtype, or language found in this org. Modify your Flexcard and try again.",
+  "lowerVersionDuplicateCardName": "Flexcard with name %s can't be migrated because lower version of same card is probable duplicate. Rename your Flexcard and try again.",
+  "duplicatedCardName": "Flexcard with duplicate name %s found in this org. Rename your Flexcard and try again.",
   "duplicatedDrName": "Data Mapper with duplicate name found in this org. Rename your Data Mapper and try again.",
   "duplicatedOSName": "Omniscript with duplicate name, type, subtype, or language found in this org. Modify your Omniscript and try again.",
+  "lowerVersionDuplicateOSName": "%s with name %s can't be migrated because lower version of same %s is probable duplicate. Rename your %s and try again.",
   "errorWhileActivatingOs": "We couldn't activate your %s:",
   "errorWhileActivatingCard": "We couldn't activate your Flexcard:",
   "errorWhileUploadingCard": "We couldn't deploy your Flexcard to your org. Review these errors:",
@@ -84,13 +86,13 @@
   "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": "The Data Mapper %s will be renamed to %s during migration.",
+  "dataRaptorNameChangeMessage": "The Data Mapper name %s will be renamed to %s during migration.",
   "integrationProcedureNameChangeMessage": "The Integration Procedure %s will be renamed to %s during migration.",
   "integrationProcedureManualUpdateMessage": "All references to %s in this Integration Procedure must be manually updated after migration.",
   "cardAuthorNameChangeMessage": "We've modified the name of this Flexcard author to adhere to the naming rules: %s",
   "cardNameChangeMessage": "We've modified the name of this Flexcard to adhere to the naming rules: %s",
   "duplicateCardNameMessage": "A Flexcard with the same name \"%s\" already exists after name cleaning, which could lead to conflicts during migration.",
-  "angularOmniscriptWarningMessage": "We couldn't migrate Angular Omniscripts. Convert all Angular Omniscripts to LWC Omniscripts, and try again.",
+  "angularOmniscriptWarningMessage": "We couldn't migrate Angular Omniscripts.",
   "apexFileChangesApplied": "Applied changes to the %s Apex class.",
   "generatingComponentReports": "Generating report for components",
   "generatingRelatedObjectReports": "Generating report for related objects",
@@ -137,7 +139,7 @@
   "enableExperienceBundleMetadataAPIProgramatically": "Enabling ExperienceBundle metadata API programmatically.",
   "unableToEnableExperienceBundleMetadataAPI": "We couldn’t enable the ExperienceBundle metadata API. Experience Cloud sites won’t be processed.",
   "relatedObjectsToProcess": "These objects will be processed: %s",
-  "consentForExperienceSites": "By proceeding further, you hereby consent to enable the ExperienceBundle metadata API and migrate Experience Cloud sites. Do you want to proceed?",
+  "consentForExperienceSites": "By proceeding further, you hereby consent to enable the ExperienceBundle metadata API and migrate Experience Cloud sites. Do you want to proceed? [y/n]",
   "noRelatedObjects": "No related objects to process",
   "turnOffExperienceBundleAPI": "Turning off the ExperienceBundle metadata API as it was enabled programmatically.",
   "errorRevertingExperienceBundleMetadataAPI": "We couldn’t revert the ExperienceBundle metadata API. Manually revert it in your org.",
@@ -193,7 +195,7 @@
   "completeComponentMappingMessage": "Registered name mappings for %s components",
   "componentMappingNotFound": "No registry mapping found for %s component: %s, using fallback cleaning",
   "integrationProcedureInvalidUnderscoreFormat": "Integration Procedure reference '%s' contains underscores in Type/SubType names. Skipping reference update to avoid incorrect parsing.",
-  "flexCardWithAngularOmniScriptWarning": "Flexcard has dependencies on Angular Omniscript(s) which are not migrated. Please convert Omniscript(s) to LWC before migrating this Flexcard.",
+  "flexCardWithAngularOmniScriptWarning": "We couldn't migrate Flexcards with dependencies on Angular Omniscripts.",
   "angularOmniScriptDependencyWarning": "Element '%s' references Angular Omniscript '%s' which will not be migrated. Consider converting the referenced Omniscript to LWC",
   "skipFlexcardAngularOmniScriptDependencyWarning": "Skipping Flexcard %s due to Angular Omniscript dependencies",
   "flexCardMigrationProcessingMessage": "Processing %s Flexcards for migration",
@@ -205,7 +207,7 @@
   "integrationProcedureTypeEmptyAfterCleaning": "Integration Procedure Type '%s' becomes empty after name cleaning. Please provide a valid Type value.",
   "integrationProcedureSubtypeEmptyAfterCleaning": "Integration Procedure SubType '%s' becomes empty after name cleaning. Please provide a valid SubType value.",
   "manifestDeployementStarted": "Manifest deployment started with ID: %s",
-  "migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Ready for Migration before proceeding with the migration. Do you want to proceed? Yes or No?",
+  "migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as either Ready for Migration or Warnings before proceeding with the migration. Do you want to proceed? [y/n]",
   "truncationFailed": "Truncation failed for %s: %s",
   "invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again",
   "errorCheckingStandardRuntime": "We couldn't check whether the Standard OmniStudio Runtime setting is enabled: %s. Try again later.",
@@ -305,5 +307,6 @@
   "enablingOmniStudioSettingsMetadataStatus": "Enabling Omnistudio Metadata setting…",
   "omniStudioAllVersionsMigrationConsent": "Org uses the standard data model. All versions of Omnistudio components such as Omniscripts, Data Mappers, Integration Procedures, and Flexcards must be migrated to enable the Omnistudio Metadata API setting. But you’ve not specified -a  or allversions flag in the command.  Proceed to migrate all versions of the Omnistudio components? [y/n]",
   "omniStudioAllVersionsMigrationConsentNotGiven": "You've not consented to migrate all versions of the Omnistudio components. We cannot proceed with the migration.",
-  "omniStudioAllVersionsMigrationConsentGiven": "You've consented to migrate all versions of the Omnistudio components."
+  "omniStudioAllVersionsMigrationConsentGiven": "You've consented to migrate all versions of the Omnistudio components.",
+  "customLWCFlexCardReferenceUpdated": "Updated Custom LWC FlexCard reference: %s -> cf%s"
 }

src/commands/omnistudio/migration/migrate.ts

@@ -399,6 +399,7 @@ export default class Migrate extends OmniStudioBaseCommand {
               name: r.name,
               data: this.mergeRecordAndUploadResults(r, cls),
               errors: r.errors,
+              totalCount: r.totalCount, // Preserve totalCount for custom labels
             };
           })
         );
@@ -690,38 +691,59 @@ export default class Migrate extends OmniStudioBaseCommand {
     const mergedResults: MigratedRecordInfo[] = [];
 
     for (const record of Array.from(migrationResults.records.values())) {
-      const obj: MigratedRecordInfo = {
-        id: record['Id'],
-        name: migrationTool.getRecordName(record),
-        status: 'Skipped',
-        errors: record['errors'],
-        migratedId: undefined,
-        warnings: [],
-        migratedName: '',
-        localizationStatus: record['localizationStatus'] || {},
-      };
-
-      if (migrationResults.results.has(record['Id'])) {
-        const recordResults = migrationResults.results.get(record['Id']);
-
-        let errors: any[] = obj.errors || [];
-        errors = errors.concat(recordResults.errors || []);
-
-        if (recordResults?.skipped) {
-          obj.status = 'Skipped';
-        } else if (!recordResults || recordResults.hasErrors) {
-          obj.status = 'Failed';
-        } else {
-          obj.status = 'Successfully migrated';
+      // For custom labels, preserve all the custom fields
+      if (migrationTool.getName().toLowerCase().includes(Constants.CustomLabelPluralName.toLowerCase())) {
+        // Use the record as-is for custom labels since it already has all the needed fields
+        const customLabelRecord = record;
+        mergedResults.push({
+          id: customLabelRecord.id || customLabelRecord.name,
+          name: customLabelRecord.name || customLabelRecord.labelName,
+          status: customLabelRecord.status || 'Skipped',
+          errors: customLabelRecord.errors || [],
+          migratedId: customLabelRecord.migratedId || customLabelRecord.id,
+          warnings: customLabelRecord.warnings || [],
+          migratedName: customLabelRecord.migratedName || customLabelRecord.name,
+          // Preserve custom fields for custom labels
+          coreInfo: customLabelRecord.coreInfo,
+          packageInfo: customLabelRecord.packageInfo,
+          message: customLabelRecord.message,
+          cloneStatus: customLabelRecord.cloneStatus,
+          labelName: customLabelRecord.labelName,
+        });
+      } else {
+        // Original logic for other components
+        const obj: MigratedRecordInfo = {
+          id: record['Id'],
+          name: migrationTool.getRecordName(record),
+          status: 'Skipped',
+          errors: record['errors'],
+          migratedId: undefined,
+          warnings: [],
+          migratedName: '',
+        };
+
+        if (migrationResults.results.has(record['Id'])) {
+          const recordResults = migrationResults.results.get(record['Id']);
+
+          let errors: any[] = obj.errors || [];
+          errors = errors.concat(recordResults.errors || []);
+
+          if (recordResults?.skipped) {
+            obj.status = 'Skipped';
+          } else if (!recordResults || recordResults.hasErrors) {
+            obj.status = 'Failed';
+          } else {
+            obj.status = 'Successfully migrated';
+          }
+
+          obj.errors = errors;
+          obj.migratedId = recordResults.id;
+          obj.warnings = recordResults.warnings;
+          obj.migratedName = recordResults.newName;
         }
 
-        obj.errors = errors;
-        obj.migratedId = recordResults.id;
-        obj.warnings = recordResults.warnings;
-        obj.migratedName = recordResults.newName;
+        mergedResults.push(obj);
       }
-
-      mergedResults.push(obj);
     }
 
     return mergedResults;