fix: @W-19837693: Handling multiple versions migration and assessment for Omniscript and Flexcards

Changes:
- Handle of multiple versions having same name pre/post clean up with allVersions
- Added logic to check for unique and duplicate based on earlier versions
- Added test cases

Author: sf-kishore-kurri

messages/assess.json

@@ -16,10 +16,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.",
+  "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 is 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:",
@@ -97,6 +98,7 @@
   "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 is 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",

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 marked as 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 marked as 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:",

src/migration/flexcard.ts

@@ -165,11 +165,12 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     const progressBar = createProgressBar('Assessing', 'Flexcards');
     progressBar.start(flexCards.length, progressCounter);
     const uniqueNames = new Set<string>();
+    const dupFlexCardNames: Set<string> = new Set<string>();
 
     // Now process each OmniScript and its elements
     for (const flexCard of flexCards) {
       try {
-        const flexCardAssessmentInfo = await this.processFlexCard(flexCard, uniqueNames);
+        const flexCardAssessmentInfo = await this.processFlexCard(flexCard, uniqueNames, dupFlexCardNames);
         flexCardAssessmentInfos.push(flexCardAssessmentInfo);
       } catch (e) {
         flexCardAssessmentInfos.push({
@@ -196,7 +197,11 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     return flexCardAssessmentInfos;
   }
 
-  private async processFlexCard(flexCard: AnyJson, uniqueNames: Set<string>): Promise<FlexCardAssessmentInfo> {
+  private async processFlexCard(
+    flexCard: AnyJson,
+    uniqueNames: Set<string>,
+    dupFlexCardNames: Set<String>
+  ): Promise<FlexCardAssessmentInfo> {
     const flexCardName = flexCard['Name'];
     Logger.info(this.messages.getMessage('processingFlexCard', [flexCardName]));
     const version = flexCard[this.namespacePrefix + CardMigrationTool.VERSION_PROP];
@@ -230,11 +235,23 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     }
 
     // Check for duplicate names (include version when allVersions is true)
+    // A Set that can only store original flexcard names to avoid conflicts with cleaned name
     const uniqueCleanedName = this.allVersions ? `${cleanedName}_${version}` : cleanedName;
-    if (uniqueNames.has(uniqueCleanedName)) {
-      flexCardAssessmentInfo.warnings.push(this.messages.getMessage('duplicateCardNameMessage', [uniqueCleanedName]));
+    if (uniqueNames.has(uniqueCleanedName) || dupFlexCardNames.has(originalName)) {
+      // Add the original flexcard name to the set
+      if (this.allVersions && !dupFlexCardNames.has(originalName)) {
+        dupFlexCardNames.add(originalName);
+      }
+      if (uniqueNames.has(uniqueCleanedName)) {
+        flexCardAssessmentInfo.warnings.push(this.messages.getMessage('duplicateCardNameMessage', [uniqueCleanedName]));
+      } else {
+        flexCardAssessmentInfo.warnings.push(
+          this.messages.getMessage('lowerVersionDuplicateCardNameMessage', [uniqueCleanedName])
+        );
+      }
       assessmentStatus = getUpdatedAssessmentStatus(assessmentStatus, 'Needs manual intervention');
     }
+
     uniqueNames.add(uniqueCleanedName);
 
     // Check for author name changes
@@ -721,11 +738,12 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     const cardsUploadInfo = new Map<string, UploadRecordResult>();
     const originalRecords = new Map<string, any>();
     const uniqueNames = new Set<string>();
+    const dupFlexCardNames: Set<string> = new Set<string>();
 
     let progressCounter = 0;
     progressBar.start(cards.length, progressCounter);
     for (let card of cards) {
-      await this.uploadCard(cards, card, cardsUploadInfo, originalRecords, uniqueNames);
+      await this.uploadCard(cards, card, cardsUploadInfo, originalRecords, uniqueNames, dupFlexCardNames);
       progressBar.update(++progressCounter);
     }
 
@@ -741,7 +759,8 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     card: AnyJson,
     cardsUploadInfo: Map<string, UploadRecordResult>,
     originalRecords: Map<string, any>,
-    uniqueNames: Set<string>
+    uniqueNames: Set<string>,
+    dupFlexCardNames: Set<String>
   ) {
     const recordId = card['Id'];
 
@@ -758,7 +777,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
           // Upload child cards
           const childCard = allCards.find((c) => c['Name'] === childCardName);
           if (childCard) {
-            await this.uploadCard(allCards, childCard, cardsUploadInfo, originalRecords, uniqueNames);
+            await this.uploadCard(allCards, childCard, cardsUploadInfo, originalRecords, uniqueNames, dupFlexCardNames);
           }
         }
 
@@ -783,8 +802,16 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
         ? `${transformedCard['Name']}_${transformedCard['VersionNumber']}`
         : transformedCard['Name'];
 
-      if (uniqueNames.has(uniqueCheckName)) {
-        this.setRecordErrors(card, this.messages.getMessage('duplicatedCardName', [uniqueCheckName]));
+      if (uniqueNames.has(uniqueCheckName) || dupFlexCardNames.has(transformedCard['Name'])) {
+        if (this.allVersions && !dupFlexCardNames.has(transformedCard['Name'])) {
+          dupFlexCardNames.add(transformedCard['Name']);
+        }
+        // change error message
+        if (uniqueNames.has(uniqueCheckName)) {
+          this.setRecordErrors(card, this.messages.getMessage('duplicatedCardName', [uniqueCheckName]));
+        } else {
+          this.setRecordErrors(card, this.messages.getMessage('lowerVersionDuplicateCardName', [uniqueCheckName]));
+        }
         originalRecords.set(recordId, card);
         return;
       }

src/migration/omniscript.ts

@@ -238,6 +238,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     const ipAssessmentInfos: IPAssessmentInfo[] = [];
 
     // Create a set to store existing OmniScript names and also extract DataRaptor and FlexCard names
+    const duplicateOmniscriptNames = new Set<string>();
     const existingOmniscriptNames = new Set<string>();
     const existingDataRaptorNames = new Set(dataRaptorAssessmentInfos.map((info) => info.name));
     const existingFlexCardNames = new Set(flexCardAssessmentInfos.map((info) => info.name));
@@ -256,7 +257,8 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           omniscript,
           existingOmniscriptNames,
           existingDataRaptorNames,
-          existingFlexCardNames
+          existingFlexCardNames,
+          duplicateOmniscriptNames
         );
       } catch (e) {
         const omniProcessType = omniscript[this.namespacePrefix + 'IsProcedure__c']
@@ -356,7 +358,8 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     omniscript: AnyJson,
     existingOmniscriptNames: Set<string>,
     existingDataRaptorNames: Set<string>,
-    existingFlexCardNames: Set<string>
+    existingFlexCardNames: Set<string>,
+    duplicateOmniscriptNames: Set<string>
   ): Promise<OSAssessmentInfo> {
     const elements = await this.getAllElementsForOmniScript(omniscript['Id']);
 
@@ -504,6 +507,11 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
       ? `${omniscript[this.namespacePrefix + 'Language__c']}`
       : '';
 
+    const recordNameWithoutVersion =
+      `${newType}_` +
+      `${newSubType}` +
+      (omniscript[this.namespacePrefix + 'Language__c'] ? `_${omniscript[this.namespacePrefix + 'Language__c']}` : '');
+
     const recordName =
       `${newType}_` +
       `${newSubType}` +
@@ -562,11 +570,47 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
       );
       assessmentStatus = 'Warnings';
     }
-    if (existingOmniscriptNames.has(recordName)) {
-      warnings.push(this.messages.getMessage('duplicatedName') + '  ' + recordName);
+    // Duplicate check logic:
+    // - When allVersions=false: check without version (using recordNameWithoutVersion)
+    // - When allVersions=true: check with version (using recordName)
+    const nameToCheck = this.allVersions ? recordName : recordNameWithoutVersion;
+
+    if (existingOmniscriptNames.has(nameToCheck) || duplicateOmniscriptNames.has(recordNameWithoutVersion)) {
+      // Mark the base name as duplicate for subsequent versions when allVersions=true
+      if (this.allVersions && !duplicateOmniscriptNames.has(recordNameWithoutVersion)) {
+        duplicateOmniscriptNames.add(recordNameWithoutVersion);
+      }
+
+      // Message selection logic:
+      // - When allVersions=false: always use "duplicatedName" (comparing without version)
+      // - When allVersions=true:
+      //   - If exact match in existingOmniscriptNames (same name+version): use "duplicatedName"
+      //   - If base name in duplicateOmniscriptNames (different version): use "lowerVersionDuplicateOmniscriptName"
+      let shouldUseDuplicatedNameMessage = false;
+
+      if (!this.allVersions) {
+        // allVersions=false: always use duplicatedName message
+        shouldUseDuplicatedNameMessage = true;
+      } else {
+        // allVersions=true: use duplicatedName only if exact match (same name+version)
+        shouldUseDuplicatedNameMessage = existingOmniscriptNames.has(recordName);
+      }
+
+      if (shouldUseDuplicatedNameMessage) {
+        warnings.push(this.messages.getMessage('duplicatedName', [recordName]));
+      } else {
+        warnings.push(
+          this.messages.getMessage('lowerVersionDuplicateOmniscriptName', [
+            this.getName(true),
+            recordName,
+            this.getName(true),
+          ])
+        );
+      }
+
       assessmentStatus = 'Needs manual intervention';
     } else {
-      existingOmniscriptNames.add(recordName);
+      existingOmniscriptNames.add(nameToCheck);
     }
 
     // Add warning for duplicate element names within the same OmniScript
@@ -692,6 +736,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     populateRegexForFunctionMetadata(functionDefinitionMetadata);
 
     const duplicatedNames = new Set<string>();
+    const duplicateOmniscriptNames = new Set<string>();
 
     // Variables to be returned After Migration
     let originalOsRecords = new Map<string, any>();
@@ -971,9 +1016,18 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
       }
 
       // Check duplicated name
-      let mappedOsName;
+      let mappedOsName: string;
+      const mappedOsNameWithoutVersion =
+        mappedOmniScript[OmniScriptMappings.Type__c] +
+        '_' +
+        mappedOmniScript[OmniScriptMappings.SubType__c] +
+        (mappedOmniScript[OmniScriptMappings.Language__c]
+          ? '_' + mappedOmniScript[OmniScriptMappings.Language__c]
+          : '');
+
       if (this.allVersions) {
         mappedOmniScript[OmniScriptMappings.Version__c] = omniscript[`${this.namespacePrefix}Version__c`];
+
         mappedOsName =
           mappedOmniScript[OmniScriptMappings.Type__c] +
           '_' +
@@ -994,9 +1048,24 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           '_1';
       }
 
-      if (duplicatedNames.has(mappedOsName)) {
+      if (duplicatedNames.has(mappedOsName) || duplicateOmniscriptNames.has(mappedOsNameWithoutVersion)) {
         originalOsRecords.set(recordId, omniscript);
-        const warningMessage = this.messages.getMessage('duplicatedOSName', [this.getName(true), mappedOsName]);
+        if (this.allVersions && !duplicateOmniscriptNames.has(mappedOsNameWithoutVersion)) {
+          duplicateOmniscriptNames.add(mappedOsNameWithoutVersion);
+        }
+
+        let warningMessage: string;
+        if (duplicatedNames.has(mappedOsName)) {
+          warningMessage = this.messages.getMessage('duplicatedOSName', [this.getName(true), mappedOsName]);
+        } else {
+          warningMessage = this.messages.getMessage('lowerVersionDuplicateOSName', [
+            this.getName(true),
+            mappedOsName,
+            this.getName(true),
+            this.getName(true),
+          ]);
+        }
+
         const skippedResponse: UploadRecordResult = {
           referenceId: recordId,
           id: '',