Merge pull request #428 from sf-kishore-kurri/u/kkurri/W-19837693

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

Author: sf-aastha-paruthi

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 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:",
@@ -38,10 +39,10 @@
   "processingDataRaptor": "Processing Data Mapper: %s",
   "processingOmniScript": "Processing Omniscript: %s",
   "foundDataRaptorsToAssess": "Found %s Data Mappers to assess.",
-  "foundOmniScriptsToAssess": "Found %s Omniscripts to assess",
+  "foundOmniScriptsToAssess": "Found %s %s to assess",
   "foundGlobalAutoNumbersToAssess": "Found %s Omni Global Auto Numbers to assess.",
   "startingDataRaptorAssessment": "Starting Data Mapper assessment",
-  "startingOmniScriptAssessment": "Starting Omniscript assessment",
+  "startingOmniScriptAssessment": "Starting %s assessment",
   "startingGlobalAutoNumberAssessment": "Starting Omni Global Auto Number assessment",
   "allVersionsInfo": "All versions: %s",
   "assessmentInitialization": "Assessment process started. Using namespace: %s",
@@ -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 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",

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

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: Map<string, string> = new Map<string, 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: Map<string, string>
+  ): Promise<FlexCardAssessmentInfo> {
     const flexCardName = flexCard['Name'];
     Logger.info(this.messages.getMessage('processingFlexCard', [flexCardName]));
     const version = flexCard[this.namespacePrefix + CardMigrationTool.VERSION_PROP];
@@ -231,11 +236,29 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
 
     // Check for duplicate names (include version when allVersions is true)
     const uniqueCleanedName = this.allVersions ? `${cleanedName}_${version}` : cleanedName;
+
+    // Check for exact duplicate (same name + same version)
     if (uniqueNames.has(uniqueCleanedName)) {
       flexCardAssessmentInfo.warnings.push(this.messages.getMessage('duplicateCardNameMessage', [uniqueCleanedName]));
       assessmentStatus = getUpdatedAssessmentStatus(assessmentStatus, 'Needs manual intervention');
     }
+    // Check for naming conflict: different original names cleaning to same name
+    else if (this.allVersions && dupFlexCardNames.has(cleanedName)) {
+      const existingOriginalName = dupFlexCardNames.get(cleanedName);
+      // Only flag if the original names are different (indicates a naming conflict)
+      if (existingOriginalName !== originalName) {
+        flexCardAssessmentInfo.warnings.push(
+          this.messages.getMessage('lowerVersionDuplicateCardNameMessage', [uniqueCleanedName])
+        );
+        assessmentStatus = getUpdatedAssessmentStatus(assessmentStatus, 'Needs manual intervention');
+      }
+    }
+
+    // Add to tracking structures
     uniqueNames.add(uniqueCleanedName);
+    if (this.allVersions && !dupFlexCardNames.has(cleanedName)) {
+      dupFlexCardNames.set(cleanedName, originalName);
+    }
 
     // Check for author name changes
     const originalAuthor = flexCard[this.namespacePrefix + 'Author__c'];
@@ -721,11 +744,13 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     const cardsUploadInfo = new Map<string, UploadRecordResult>();
     const originalRecords = new Map<string, any>();
     const uniqueNames = new Set<string>();
+    // Map to track cleanedName -> originalName for duplicate detection
+    const dupFlexCardNames: Map<string, string> = new Map<string, 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 +766,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: Map<string, string>
   ) {
     const recordId = card['Id'];
 
@@ -758,7 +784,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,14 +809,31 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
         ? `${transformedCard['Name']}_${transformedCard['VersionNumber']}`
         : transformedCard['Name'];
 
+      const originalCardName = card['Name'];
+      const cleanedCardName = transformedCard['Name'];
+
+      // Check for exact duplicate (same name + same version)
       if (uniqueNames.has(uniqueCheckName)) {
         this.setRecordErrors(card, this.messages.getMessage('duplicatedCardName', [uniqueCheckName]));
         originalRecords.set(recordId, card);
         return;
       }
+      // Check for naming conflict: different original names cleaning to same name
+      else if (this.allVersions && dupFlexCardNames.has(cleanedCardName)) {
+        const existingOriginalName = dupFlexCardNames.get(cleanedCardName);
+        // Only flag if the original names are different (indicates a naming conflict)
+        if (existingOriginalName !== originalCardName) {
+          this.setRecordErrors(card, this.messages.getMessage('lowerVersionDuplicateCardName', [uniqueCheckName]));
+          originalRecords.set(recordId, card);
+          return;
+        }
+      }
 
-      // Save the name for duplicated names check (with version if allVersions is true)
+      // Add to tracking structures
       uniqueNames.add(uniqueCheckName);
+      if (this.allVersions && !dupFlexCardNames.has(cleanedCardName)) {
+        dupFlexCardNames.set(cleanedCardName, originalCardName);
+      }
 
       // Create a map of the original records
       originalRecords.set(recordId, card);

src/migration/omniscript.ts

@@ -238,6 +238,8 @@ 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
+    // Map to track cleanedName (without version) -> originalName (without version) for duplicate detection
+    const duplicateOmniscriptNames: Map<string, string> = new Map<string, 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 +258,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 +359,8 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     omniscript: AnyJson,
     existingOmniscriptNames: Set<string>,
     existingDataRaptorNames: Set<string>,
-    existingFlexCardNames: Set<string>
+    existingFlexCardNames: Set<string>,
+    duplicateOmniscriptNames: Map<string, string>
   ): Promise<OSAssessmentInfo> {
     const elements = await this.getAllElementsForOmniScript(omniscript['Id']);
 
@@ -504,6 +508,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 +571,43 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
       );
       assessmentStatus = 'Warnings';
     }
-    if (existingOmniscriptNames.has(recordName)) {
-      warnings.push(this.messages.getMessage('duplicatedName') + '  ' + recordName);
+    // Duplicate check logic using Map to track originalName -> cleanedName
+    // This allows us to detect both exact duplicates and name cleaning conflicts
+    const nameToCheck = this.allVersions ? recordName : recordNameWithoutVersion;
+
+    // Get the original name parts (before cleaning)
+    const originalType = omniscript[this.namespacePrefix + 'Type__c'];
+    const originalSubType = omniscript[this.namespacePrefix + 'SubType__c'];
+    const originalLanguage = omniscript[this.namespacePrefix + 'Language__c'] || '';
+    const originalNameWithoutVersion = originalLanguage
+      ? `${originalType}_${originalSubType}_${originalLanguage}`
+      : `${originalType}_${originalSubType}`;
+
+    // Check for exact duplicate (same name + version)
+    if (existingOmniscriptNames.has(nameToCheck)) {
+      warnings.push(this.messages.getMessage('duplicatedName', [recordName]));
       assessmentStatus = 'Needs manual intervention';
-    } else {
-      existingOmniscriptNames.add(recordName);
+    }
+    // Check for naming conflict: different original names cleaning to same name
+    else if (this.allVersions && duplicateOmniscriptNames.has(recordNameWithoutVersion)) {
+      const existingOriginalName = duplicateOmniscriptNames.get(recordNameWithoutVersion);
+      // Only flag if the original names are different (indicates a naming conflict)
+      if (existingOriginalName !== originalNameWithoutVersion) {
+        warnings.push(
+          this.messages.getMessage('lowerVersionDuplicateOmniscriptName', [
+            this.getName(true),
+            recordName,
+            this.getName(true),
+          ])
+        );
+        assessmentStatus = 'Needs manual intervention';
+      }
+    }
+
+    // Add to tracking structures
+    existingOmniscriptNames.add(nameToCheck);
+    if (this.allVersions && !duplicateOmniscriptNames.has(recordNameWithoutVersion)) {
+      duplicateOmniscriptNames.set(recordNameWithoutVersion, originalNameWithoutVersion);
     }
 
     // Add warning for duplicate element names within the same OmniScript
@@ -692,6 +733,8 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     populateRegexForFunctionMetadata(functionDefinitionMetadata);
 
     const duplicatedNames = new Set<string>();
+    // Map to track cleanedName (without version) -> originalName (without version) for duplicate detection
+    const duplicateOmniscriptNames: Map<string, string> = new Map<string, string>();
 
     // Variables to be returned After Migration
     let originalOsRecords = new Map<string, any>();
@@ -971,9 +1014,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,8 +1046,16 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           '_1';
       }
 
+      // Get original name parts for tracking
+      const originalType = omniscript[this.namespacePrefix + 'Type__c'];
+      const originalSubType = omniscript[this.namespacePrefix + 'SubType__c'];
+      const originalLanguage = omniscript[this.namespacePrefix + 'Language__c'] || '';
+      const originalNameWithoutVersion = originalLanguage
+        ? `${originalType}_${originalSubType}_${originalLanguage}`
+        : `${originalType}_${originalSubType}`;
+
+      // Check for exact duplicate (same name + same version)
       if (duplicatedNames.has(mappedOsName)) {
-        originalOsRecords.set(recordId, omniscript);
         const warningMessage = this.messages.getMessage('duplicatedOSName', [this.getName(true), mappedOsName]);
         const skippedResponse: UploadRecordResult = {
           referenceId: recordId,
@@ -1008,8 +1068,35 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           skipped: true,
         };
         osUploadInfo.set(recordId, skippedResponse);
+        originalOsRecords.set(recordId, omniscript);
         continue;
       }
+      // Check for naming conflict: different original names cleaning to same name
+      else if (this.allVersions && duplicateOmniscriptNames.has(mappedOsNameWithoutVersion)) {
+        const existingOriginalName = duplicateOmniscriptNames.get(mappedOsNameWithoutVersion);
+        // Only flag if the original names are different (indicates a naming conflict)
+        if (existingOriginalName !== originalNameWithoutVersion) {
+          const warningMessage = this.messages.getMessage('lowerVersionDuplicateOSName', [
+            this.getName(true),
+            mappedOsName,
+            this.getName(true),
+            this.getName(true),
+          ]);
+          const skippedResponse: UploadRecordResult = {
+            referenceId: recordId,
+            id: '',
+            success: false,
+            hasErrors: false,
+            errors: [],
+            warnings: [warningMessage],
+            newName: '',
+            skipped: true,
+          };
+          osUploadInfo.set(recordId, skippedResponse);
+          originalOsRecords.set(recordId, omniscript);
+          continue;
+        }
+      }
 
       // Save the mapped record
       mappedRecords.push(mappedOmniScript);
@@ -1059,8 +1146,14 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
             '_1';
         }
         // Always set the new name to show the migrated name
-        // Add the processednew name to the duplicated set
+        // Add the processed new name to the duplicated set
         duplicatedNames.add(mappedOsName);
+
+        // Add to map for tracking naming conflicts (only when allVersions=true)
+        if (this.allVersions && !duplicateOmniscriptNames.has(mappedOsNameWithoutVersion)) {
+          duplicateOmniscriptNames.set(mappedOsNameWithoutVersion, originalNameWithoutVersion);
+        }
+
         osUploadResponse.newName = mappedOsName;
 
         // Only add warning if the name was actually modified