chore: blitz fixes

Author: sf-aastha-paruthi

messages/assess.json

@@ -18,7 +18,7 @@
   "invalidOrRepeatingOmniscriptElementNames": "Omniscript with invalid or duplicate element names found. Rename your Omniscript elements 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.",
+  "duplicatedOSName": "%s with duplicate name, type, subtype, or language found in this org. Modify your %s and try again.",
   "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:",
@@ -173,7 +173,7 @@
   "manualInterventionForExperienceSite": "We couldn’t process the %s component because no key was found.",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component. ",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found. ",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of error in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",

messages/migrate.json

@@ -22,7 +22,7 @@
   "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.",
+  "duplicatedOSName": "%s with duplicate name, type, subtype, or language found in this org. Modify your %s 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:",
@@ -166,7 +166,7 @@
   "emptyTargetData": "The Target Name is empty. Check your Experience Cloud site configuration",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component.",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found.",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of error in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts %s",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",

src/migration/related/ExperienceSiteMigration.ts

@@ -441,7 +441,8 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
     // Look up in osStandardStorage using the object key
     const targetDataFromStorage: OmniScriptStorage = StorageUtil.getStandardOmniScript(storage, lookupKey);
 
-    if (this.shouldAddWarning(targetDataFromStorage)) {
+    if (targetDataFromStorage === undefined || targetDataFromStorage.migrationSuccess === false) {
+      // For the standard wrapper we only need to check the storage empty and migrationSuccess status
       const originalKey = `${currentType}_${currentSubType}_${currentLanguage}`;
       const warningMsg: string = this.getWarningMessage(originalKey, targetDataFromStorage);
       experienceSiteAssessmentInfo.warnings.push(warningMsg);